mid-point of rewriting the query + field function

This rewriting allows for users to actually search for open-text
fields. It also gives the basis for much more scalability, by allowing
people to query particular fields with particular values.