Fixed group highlighting