some tweaks in urls