remooved encodeURIComponent