Added handling of radio button group values