add empty group handling