Fix sometimes incorrect URI percent encoding