CSV export improvements