GroupSearch Fix