[fix bug 896365] Replace CharField with ModelChoiceField.