Fixes for sub-routes and ids