Update logic on checking group empty.
Update logic on getting group's fields.