Corrected URLs, less user info transformations