Fixed issues with autocomplete startup errors due to using
ChoiceField instead of ModelChoiceField