Added more Team demo data, entity and service changes for searching by team and team member