re-factor Propel1 ModelChoiceList