Pass query_string requests directly through to ES where set
Fix building of query string