Tweaks to URL forwarding