BRANCH 4.3: more fixes to data export