Update the search system to handle timeouts