PIM-3320: fix pqb and mongo filters
PIM-3320: clean sorter and filter definitions