better querystring support