Fix group searching again.