Bugfixes to the indexer -- working on testset