Dazzle Control Groups

Hello,
im having trouble with the new dazzle and control groups. Whenever i set the control group to his spirit it will be fine until i level it up, then i need to set it again. Has anyone found a solution to be able to select just the spirit or just the hero? No matter what its selecting both after its leveled up.