HasOnePickerField - clarify arguments and fix dataModelClass issue