changes in indexer to work with latest hunt version