Bug fix export data
overwrite name with long name if available