Add an `RFC3986 component, modified encoded_of_query signature, needed for AWS