Add field_groups to demo data to stabilise dependency
Added opportunity indexes