the advance condition (i.e. line 4 in your description) should depend not on the unfiltered count but all messages having been tombstones