Bugfix #2: encodeURI bug