CSV Export, Person-based refactor: add namespace id to Demographic map
(as in 1.3)