fixes for the indexer