Fixed Track routes
Merge branch 'hotfix-trackroutes' into development