Rename "simple" query "simple_query_string"