Added default value to switch and spruce gate to fence gate handler