Added decodeURIComponent