Tweaks to routes
Fix for doubly executed subdefinitions