That may bypass the issue, but will still not resolve the origin URL encoding problem. If by any chance a URL comes up with a special character – a permalink or anything similar, the issue will continue. I guess this is an okay solution for now though.
