EZP-22105: merge filter and query criterions