Repair search and timeout defects

No match.