Fix duplicate publishing bug in mode/zone pickers