Fixed Indexer bugs