More query string improvements