DELTASPIKE-487 moved navigation logic to own NavigationHandler