Can now save both switch fields on edit form