Another querystring fix