redoing the indexing to remove skipped indices caused by errors during
extraction
Merge branch 'ShabihsBranch'