query string improvement