Update radio/checkboxes to match definition of FORMS
Rebuild