Added search_api patch