PIM-32650 : re-work ORM filters and sorters to avoid the use of catalog context