147 - nav fixes

tracker 24765