improve highligter merges across punctuation