Make fieldsToList use fieldsToSingle internally