querystring handling modified