Add encodeURIComponent