improve highlighter merges across stopwords
fix highlight not being relative to font size