DELTASPIKE-626 unified handling of navigation-handlers