fixed querystring issue