fix unapplying highlights and the highlight interface