Highlighter fixes

fixes #2184, #2099,  #2181