Added handling of match queries in Request/Search/Criteria