Fix indexer to use new mapping.