Highlighting improvements