Fix routing issue #WIP
Fix issue with routing
Merge branch 'feature/routing_issue' into develop