Navig highlight - Performance optimisations