Indexer fix for index field collisions.