Add search client and extract it from API repository