App: Improve rerouting at start

Implemented in Kurviger 1.13.17.