highlighter fixes