Fix new URL handling