More url tweaks