Fix with test for issue with URIBuilder decoding query parmeters twice