Change to native querystring