replaced all uris with user friendly uris