Refinements to tagging process
Tweaks to highlighter discarding of fragments