more fixes for data export