APD-7: make the search execution works.