indexer fixes and tests