More url parsing fixes.