Reworked querqy matchers