Refactor CSV import
Add rest of single choice fields to CSV import