Fix language index for modules part1
Fix language index for modules part2