Switch back to using query instead of query_text

(This was breaking the location search.)