some fix in URI encode