Added encodeURIComponent