cleanURIComponent added