Removed extraneous break statements in MetadataControlFactory, set default values in ChoiceMetadataFormControl