XD-1004 Fix routes

- Maintain routes hierarchy