Search API upgrade