798 highlighter regressions

These changes fix all the regressions in highlighter and social mode behavior to accommodate the new multi-frame model.

Fixes #798