Maintain CSV field order on CSV export, fixes #690