Fixing decodeURI => decodeURIComponent