Don't lose options in form schemas