Update CirrusSearch

Picks up better error handling and fixes some rare errors on updates.

Change-Id: I2cfcfaf065abf4f9dd9aea9f3fc473031a3aa620