fixed URI encoding issue