CSV Export, Person-based refactor: addl null logic