[RFR] enable choice field

finalize and enable choice field.