Fixed bug with query_string matching