location entity: Use field base/instances, added keys group and laundry field