Normalize the query string too