Fix the overlap in the highlighter