Rewrite CHOICE field setting code to properly handle