Dispatcher optimalizations
Navigation service fix