Fix and tweak watcher updater after an index refresh.