Merge "Fix highlighting of matches in text of escaped html entities"