use the dismax query parser and fix a bad query field

I had accidentally left in a `text` field query, which should have been `token_text` (I was trying to consolidate these two). I fixed that, and then simplified the querying logic a little by using a more robust query parser. I've tested this more thoroughly and it seems good to go :)