Fixed URI formating