Rework on the detection of new vs existing smartgroup