Fixed issue where initially selected checkboxes/radios weren't accounted for