Configure the client after any middleware had the chance to modify the query option.

Any modification to the query object will now result in the correct URL + Query
String being requested.

Also fixes the issue where the query string would get concatenated for each
subsequent retry.