MDL-53281 search: Properly set timeout, and don't wait for optimize