Include non-imported data in export
Fix importless-export in map data export too