OPAL-1725: Navigation arrows for variables fixed