Enhance and fix parrallel indexing