Minor changes in indexer