[PATCH 1/2] Let addons return only their content