Fix EntityBatchIndexer construction