Fix for #378: Highlighter returns unexpected results if one term is found within another.