Fix url emcoding issue