Fixed URL handling