improve querystring building