Fix "empty" match queries.