Repaired entities indexing