@jlast My first impulse is to deal with this problem at the moment addHighlight is called. This function adds the ‘preview-selection’ class to a target element which creates the yellow highlight. The preview object is available in props, one could check the target element's innerHTML against the preview.expression and see if there’s a complete match. If not, recursively compare the previous and next elements. If they’re innerHTML is found in the preview.expression, then add the highlight as well, and if not, stop searching. Would also have to make sure those extra elements had ‘preview-selection’ class removed as well when removeHighlight was called. What are your thoughts on this approach?