URI encode query params when constructing the query string
Merge branch 'invalid_invalid_request_error'