[EH] navigation improvements