Refactor HighlightAwareHtmlEscaperService