fixed URI encode issue