[BUGFIX] Ensure correct field ordering in CSV export