PIM-2341 : fix ORM filters and sorters