fixed entity switch groups