Fix demo data with new datastore