Tweaks to fix url mapping