Fixed URL creation