More highlight/dehighlighting

Highlighting works for the chart, but not dehighlighting