Added autorectify support to indexer