Mike_ Still more work on Search API