progress with fixing indexer