Fix group search.

Change-Id: I29c35e35a9972006fa660b9e007539eb290c9471