Replace ChoiceField type_label

Fix issue  #1618