Move creation of original tasks to before block inside task indexing functions