Changes to highlightMentions