merged uralbash's websafe_uri-patch, thanks! But merging this 2 year old
patch was far too much work for a single line of code :-)