Fixes to highlight clearing