Handle update failures better, including case where no results are discovered