Further work on fixing route finding