Fix bug where highlighted content was saved to model