Moved the highlighting of the alert term, downstream so Text and HTML can highlight differently.