[arctic] - Update for multi-select & switch