Enhancement to make sure in case the number of errors exceeds threshold we let the query continue
Enhanced the retry logic to continue beyond the initial timeout to retry timeout