Added highlight/selection reset