Multi-match queries no longer needed