Move Data Indexing from the end to right before Expanded Document Form
Fix typo