Fixed URL parsing