APD-7: make search execution work for first search group.