Fixed broken group selection
Fixed group selection