Additinal URL tweaks