Corrected handling of non-model choice fields.
Added emphasis to required field labels.