Group assigning and creation logic fix