Don't quote valid characters in url

Hi,

A commit  has introduced the issue #125 again.

I've included the fix and a test for this case.

Regards

Clément