Fix cell-selection after changing header status