Fixed query string bug