Fixes single word (names) query for matchall