CLSN-427cs-field-radio button handling improvement