[bug 1007319] Switch to match and match_phrase queries.

I think I got all of them. r?