Update demo data query to work with v2 schema.