fixed URI bugs