Fix highlights with rearranged/disabled columns