Fixed mistakes in Indexer part A