Indexer was indexing overrides separately from the master - causing twice the work and possibly indexing errors. Leave it up to the index classes to deal with overrides and indexes.