Fixed group search issues