fix checkbox/radio selection and storage