Fixing group highlighting