Switch to new search API