Fix edition/deletion of switches