Changed group column to entity_id