add querystring support