Updates to follow-complete indexer.