tet-switch bugfix + CP.BringGroupToFront on click