More index updates

And so on