Fixed URL formats again