work on indexer performance