Move es_wrapper to use query_string query