Queries and filters have been merged in es master, so we need to remove our use of the query filter and instead make it just a query_string filter.