More smart switch editing