some imprav on data export