More url fixing