removed unnecessary customization and made sure that the correct value is set when no actual option is selected