DB: fix some demo data errors, following updated entities;