Querystring bugfix