Resolve some bug with marketplace demo data