Give search index repair the same treatment as kv