Switch from ISearchable to the new search API
Switch from ISearchable to the new search API