Only extract uri query params when building the request, close #598