EN Index Lang improvements