Here's the latest patch.  I think this should address the problem.  The query string is now only appended to the end of a URI in the HTTP and HTTPS cases.

The add-uri test now passes, and 'make check' still passes.

-- Gabriel