PIM-3250 : re-work entity filter (orm)