better querystring fix