Re-fix metadata using new datastore