[BUGFIX] Use encodeURI not escape