Fixed URL handling (again