URIComponent instead of encodeURI