Fix #8098 - refinements to code navigator