improve hightlighter performance