MDL-44711 navigation: improved expandable course calculation