Fix: broken features with multicompany
Fix: use $conf->entity if defined