diff --git a/build.js b/build.js
index ce6fe8f..7d0b91f 100644
--- a/build.js
+++ b/build.js
@@ -3,7 +3,8 @@ const fs    = require('fs');
 const os    = require('os');
 const build = require('extra-build');
 const csv   = require('csv-parse');
-const descriptions = require('@ifct2017/descriptions')
+const columns      = require('@ifct2017/columns');
+const descriptions = require('@ifct2017/descriptions');
 const groups       = require('@ifct2017/groups');
 
 const owner = 'ifct2017';
@@ -150,7 +151,8 @@ async function generateIndexCsv() {
 
 
   async function main() {
-    grupCorpus = groups.load();
+    await columns.load();
+    grupCorpus = await groups.load();
     descCorpus = await descriptions.load();
     factors = await readCsv('configs/factors.csv', (acc, r) => acc.set(r.code, r.factor),     new Map());
     renames = await readCsv('configs/renames.csv', (acc, r) => acc.set(r.code, r.actual),     new Map());
@@ -166,7 +168,7 @@ async function generateIndexCsv() {
     sumAll(dat);
     dat = orderAll(dat);
     var ks = Object.keys(dat);
-    var a  = ks.join() + os.EOL;
+    var a  = ks.map(k => `"${columns(k.replace(/_e$/, ''))[0].name}; ${k}"`).join() + os.EOL;
     for (var i=0; i<di; i++) {
       for (var k of ks) {
         var v = dat[k][i];
diff --git a/index.csv b/index.csv
index 9d1895b..354f8b5 100644
--- a/index.csv
+++ b/index.csv
@@ -1,4 +1,4 @@
-code,name,scie,lang,grup,regn,tags,enerc,enerc_e,water,water_e,ash,ash_e,vit,vit_e,fatce,fatce_e,cholc,cholc_e,fibtg,fibtg_e,choavldf,choavldf_e,protcnt,protcnt_e,amiac,amiac_e,cartoid,cartoid_e,polyph,polyph_e,phystr,phystr_e,tocph,tocph_e,toctr,toctr_e,orgac,orgac_e,phytac,phytac_e,sapon,sapon_e,mnrleq,mnrleq_e,mnrlet,mnrlet_e,mnrlpet,mnrlpet_e,mnrlnet,mnrlnet_e,mnrltx,mnrltx_e,vita,vita_e,vitb,vitb_e,vitc,vitc_e,vitd,vitd_e,vite,vite_e,vitk,vitk_e,fasat,fasat_e,fauns,fauns_e,faess,faess_e,facis,facis_e,fatrn,fatrn_e,fams,fams_e,fapu,fapu_e,facn3,facn3_e,facn6,facn6_e,facn9,facn9_e,facn5,facn5_e,facn7,facn7_e,fibins,fibins_e,fibsol,fibsol_e,cho,cho_e,starch,starch_e,olsac,olsac_e,fsugar,fsugar_e,amiace,amiace_e,amiacce,amiacce_e,amiacne,amiacne_e,retol,retol_e,thia,thia_e,ribf,ribf_e,nia,nia_e,pantac,pantac_e,vitb6c,vitb6c_e,biot,biot_e,folsum,folsum_e,ergcal,ergcal_e,chocal,chocal_e,doh25,doh25_e,tocpha,tocpha_e,tocphb,tocphb_e,tocphg,tocphg_e,tocphd,tocphd_e,toctra,toctra_e,toctrb,toctrb_e,toctrg,toctrg_e,toctrd,toctrd_e,vitk1,vitk1_e,vitk2,vitk2_e,lutn,lutn_e,zea,zea_e,lycpn,lycpn_e,crypxb,crypxb_e,cartg,cartg_e,carta,carta_e,cartb,cartb_e,al,al_e,as,as_e,cd,cd_e,ca,ca_e,cr,cr_e,co,co_e,cu,cu_e,fe,fe_e,pb,pb_e,li,li_e,mg,mg_e,mn,mn_e,hg,hg_e,mo,mo_e,ni,ni_e,p,p_e,k,k_e,se,se_e,na,na_e,zn,zn_e,frus,frus_e,glus,glus_e,sucs,sucs_e,mals,mals_e,lactose,lactose_e,f4d0,f4d0_e,f6d0,f6d0_e,f8d0,f8d0_e,f10d0,f10d0_e,f12d0,f12d0_e,f14d0,f14d0_e,f16d0,f16d0_e,f18d0,f18d0_e,f20d0,f20d0_e,f22d0,f22d0_e,f24d0,f24d0_e,f14d1cn5,f14d1cn5_e,f16d1cn7,f16d1cn7_e,f18d1cn9,f18d1cn9_e,f18d1tn9,f18d1tn9_e,f20d1cn9,f20d1cn9_e,f22d1cn9,f22d1cn9_e,f24d1cn9,f24d1cn9_e,f18d2cn6,f18d2cn6_e,f20d2n6,f20d2n6_e,f18d3n3,f18d3n3_e,f20d4n6,f20d4n6_e,f11d0,f11d0_e,f15d0,f15d0_e,f20d3n6,f20d3n6_e,f20d5n3,f20d5n3_e,f22d6n3,f22d6n3_e,f22d2n6,f22d2n6_e,f22d5n3,f22d5n3_e,his,his_e,ile,ile_e,leu,leu_e,lys,lys_e,met,met_e,cys,cys_e,phe,phe_e,thr,thr_e,trp,trp_e,val,val_e,ala,ala_e,arg,arg_e,asp,asp_e,glu,glu_e,gly,gly_e,pro,pro_e,ser,ser_e,tyr,tyr_e,oxalt,oxalt_e,oxals,oxals_e,oxali,oxali_e,caconac,caconac_e,citac,citac_e,fumac,fumac_e,malac,malac_e,quinac,quinac_e,sucac,sucac_e,tarac,tarac_e,dhbenzac34,dhbenzac34_e,hbenzal3,hbenzal3_e,pcathac,pcathac_e,vanlac,vanlac_e,gallac,gallac_e,cinmac,cinmac_e,coumaco,coumaco_e,coumacp,coumacp_e,caffac,caffac_e,chlrac,chlrac_e,ferac,ferac_e,apigen,apigen_e,apigen6cgls,apigen6cgls_e,apigen7onshps,apigen7onshps_e,luteol,luteol_e,kaemf,kaemf_e,querce,querce_e,querce3bdgls,querce3bdgls_e,querce3ortns,querce3ortns_e,querce3bgls,querce3bgls_e,isormt,isormt_e,myrct,myrct_e,rsvrtol,rsvrtol_e,hespt,hespt_e,narng,narng_e,hespd,hespd_e,daidzn,daidzn_e,gnstein,gnstein_e,epicatec,epicatec_e,epicategc,epicategc_e,epicatgc3gal,epicatgc3gal_e,catec,catec_e,galcatecgal,galcatecgal_e,galcatec,galcatec_e,syrgac,syrgac_e,sinpac,sinpac_e,ellgac,ellgac_e,rafs,rafs_e,stas,stas_e,vers,vers_e,ajgs,ajgs_e,camt,camt_e,stgstr,stgstr_e,stostrb,stostrb_e,carot,carot_e,xantp,xantp_e,cartbeq,cartbeq_e
+"Food Code; code","Food Name; name","Scientific Name; scie","Local Name; lang","Food Group; grup","No. of Regions; regn","Tags; tags","Energy; enerc","Energy; enerc_e","Moisture; water","Moisture; water_e","Ash; ash","Ash; ash_e","Vitamins; vit","Vitamins; vit_e","Total Fat; fatce","Total Fat; fatce_e","Cholesterol; cholc","Cholesterol; cholc_e","Dietary Fiber; fibtg","Dietary Fiber; fibtg_e","Carbohydrate; choavldf","Carbohydrate; choavldf_e","Protein; protcnt","Protein; protcnt_e","Essential Amino acids; amiac","Essential Amino acids; amiac_e","Carotenoids; cartoid","Carotenoids; cartoid_e","Polyphenols; polyph","Polyphenols; polyph_e","Phytosterols; phystr","Phytosterols; phystr_e","Tocopherols; tocph","Tocopherols; tocph_e","Tocotrienols; toctr","Tocotrienols; toctr_e","Organic acids; orgac","Organic acids; orgac_e","Phytate; phytac","Phytate; phytac_e","Saponins; sapon","Saponins; sapon_e","Essential Quantity Minerals; mnrleq","Essential Quantity Minerals; mnrleq_e","Essential Trace Minerals; mnrlet","Essential Trace Minerals; mnrlet_e","Possibly essential Trace Minerals; mnrlpet","Possibly essential Trace Minerals; mnrlpet_e","Non-essential Trace Minerals; mnrlnet","Non-essential Trace Minerals; mnrlnet_e","Toxic Minerals; mnrltx","Toxic Minerals; mnrltx_e","Vitamin A; vita","Vitamin A; vita_e","Vitamin B; vitb","Vitamin B; vitb_e","Ascorbic acids (C); vitc","Ascorbic acids (C); vitc_e","Vitamin D; vitd","Vitamin D; vitd_e","α-Tocopherol equivalent (E); vite","α-Tocopherol equivalent (E); vite_e","Vitamin K; vitk","Vitamin K; vitk_e","Saturated Fatty acids; fasat","Saturated Fatty acids; fasat_e","Unsaturated Fatty acids; fauns","Unsaturated Fatty acids; fauns_e","Essential Fatty acids; faess","Essential Fatty acids; faess_e","Cis Fatty acids; facis","Cis Fatty acids; facis_e","Trans Fatty acids; fatrn","Trans Fatty acids; fatrn_e","Monounsaturated Fatty acids; fams","Monounsaturated Fatty acids; fams_e","Polyunsaturated Fatty acids; fapu","Polyunsaturated Fatty acids; fapu_e","Cis ω-3 Fatty acids; facn3","Cis ω-3 Fatty acids; facn3_e","Cis ω-6 Fatty acids; facn6","Cis ω-6 Fatty acids; facn6_e","Cis ω-9 Fatty acids; facn9","Cis ω-9 Fatty acids; facn9_e","Cis ω-5 Fatty acids; facn5","Cis ω-5 Fatty acids; facn5_e","Cis ω-7 Fatty acids; facn7","Cis ω-7 Fatty acids; facn7_e","Insoluble Dietary Fiber; fibins","Insoluble Dietary Fiber; fibins_e","Soluble Dietary Fiber; fibsol","Soluble Dietary Fiber; fibsol_e","Available CHO; cho","Available CHO; cho_e","Starch; starch","Starch; starch_e","Oligosaccharides; olsac","Oligosaccharides; olsac_e","Free Sugars; fsugar","Free Sugars; fsugar_e","Essential Amino acids; amiace","Essential Amino acids; amiace_e","Conditionally essential Amino acids; amiacce","Conditionally essential Amino acids; amiacce_e","Non-essential Amino acids; amiacne","Non-essential Amino acids; amiacne_e","Retinol; retol","Retinol; retol_e","Thiamine (B1); thia","Thiamine (B1); thia_e","Riboflavin (B2); ribf","Riboflavin (B2); ribf_e","Niacin (B3); nia","Niacin (B3); nia_e","Pantothenic acid (B5); pantac","Pantothenic acid (B5); pantac_e","Total B6; vitb6c","Total B6; vitb6c_e","Biotin (B7); biot","Biotin (B7); biot_e","Folates (B9); folsum","Folates (B9); folsum_e","Ergocalciferol (D2); ergcal","Ergocalciferol (D2); ergcal_e","Cholecalciferol (D3); chocal","Cholecalciferol (D3); chocal_e","25-OH-D3; doh25","25-OH-D3; doh25_e","α-Tocopherol; tocpha","α-Tocopherol; tocpha_e","β-Tocopherol; tocphb","β-Tocopherol; tocphb_e","γ-Tocopherol; tocphg","γ-Tocopherol; tocphg_e","δ-Tocopherol; tocphd","δ-Tocopherol; tocphd_e","α-Tocotrienol; toctra","α-Tocotrienol; toctra_e","β-Tocotrienol; toctrb","β-Tocotrienol; toctrb_e","γ-Tocotrienol; toctrg","γ-Tocotrienol; toctrg_e","δ-Tocotrienol; toctrd","δ-Tocotrienol; toctrd_e","Phylloquinones (K1); vitk1","Phylloquinones (K1); vitk1_e","Menaquinones (K2); vitk2","Menaquinones (K2); vitk2_e","Lutein; lutn","Lutein; lutn_e","Zeaxanthin; zea","Zeaxanthin; zea_e","Lycopene; lycpn","Lycopene; lycpn_e","β-Cryptoxanthin; crypxb","β-Cryptoxanthin; crypxb_e","γ-Carotene; cartg","γ-Carotene; cartg_e","α-Carotene; carta","α-Carotene; carta_e","β-Carotene; cartb","β-Carotene; cartb_e","Aluminium (Al); al","Aluminium (Al); al_e","Arsenic (As); as","Arsenic (As); as_e","Cadmium (Cd); cd","Cadmium (Cd); cd_e","Calcium (Ca); ca","Calcium (Ca); ca_e","Chromium (Cr); cr","Chromium (Cr); cr_e","Cobalt (Co); co","Cobalt (Co); co_e","Copper (Cu); cu","Copper (Cu); cu_e","Iron (Fe); fe","Iron (Fe); fe_e","Lead (Pb); pb","Lead (Pb); pb_e","Lithium (Li); li","Lithium (Li); li_e","Magnesium (Mg); mg","Magnesium (Mg); mg_e","Manganese (Mn); mn","Manganese (Mn); mn_e","Mercury (Hg); hg","Mercury (Hg); hg_e","Molybdenum (Mo); mo","Molybdenum (Mo); mo_e","Nickel (Ni); ni","Nickel (Ni); ni_e","Phosphorus (P); p","Phosphorus (P); p_e","Potassium (K); k","Potassium (K); k_e","Selenium (Se); se","Selenium (Se); se_e","Sodium (Na); na","Sodium (Na); na_e","Zinc (Zn); zn","Zinc (Zn); zn_e","Fructose; frus","Fructose; frus_e","Glucose; glus","Glucose; glus_e","Sucrose; sucs","Sucrose; sucs_e","Maltose; mals","Maltose; mals_e","Lactose; lactose","Lactose; lactose_e","Butyric acid (C4:0); f4d0","Butyric acid (C4:0); f4d0_e","Caproic acid (C6:0); f6d0","Caproic acid (C6:0); f6d0_e","Caprylic acid (C8:0); f8d0","Caprylic acid (C8:0); f8d0_e","Capric acid (C10:0); f10d0","Capric acid (C10:0); f10d0_e","Lauric acid (C12:0); f12d0","Lauric acid (C12:0); f12d0_e","Myristic acid (C14:0); f14d0","Myristic acid (C14:0); f14d0_e","Palmitic acid (C16:0); f16d0","Palmitic acid (C16:0); f16d0_e","Stearic acid (C18:0); f18d0","Stearic acid (C18:0); f18d0_e","Arachidic acid (C20:0); f20d0","Arachidic acid (C20:0); f20d0_e","Behenic acid (C22:0); f22d0","Behenic acid (C22:0); f22d0_e","Lignoceric acid (C24:0); f24d0","Lignoceric acid (C24:0); f24d0_e","Myristoleic acid (C14:1); f14d1cn5","Myristoleic acid (C14:1); f14d1cn5_e","Palmitoleic acid (C16:1); f16d1cn7","Palmitoleic acid (C16:1); f16d1cn7_e","Oleic acid (C18:1n9); f18d1cn9","Oleic acid (C18:1n9); f18d1cn9_e","Elaidic acid (C18:1n9t); f18d1tn9","Elaidic acid (C18:1n9t); f18d1tn9_e","Eicosenoic acid (C20:1n9); f20d1cn9","Eicosenoic acid (C20:1n9); f20d1cn9_e","Erucic acid (C22:1n9); f22d1cn9","Erucic acid (C22:1n9); f22d1cn9_e","Nervonic acid (C24:1n9); f24d1cn9","Nervonic acid (C24:1n9); f24d1cn9_e","Linoleic acid (C18:2n6); f18d2cn6","Linoleic acid (C18:2n6); f18d2cn6_e","Eicosadienoic acid (C20:2); f20d2n6","Eicosadienoic acid (C20:2); f20d2n6_e","α-Linolenic acid (C18:3n3); f18d3n3","α-Linolenic acid (C18:3n3); f18d3n3_e","Arachidonic acid (C20:4n6); f20d4n6","Arachidonic acid (C20:4n6); f20d4n6_e","Undecanoic acid (C11:0); f11d0","Undecanoic acid (C11:0); f11d0_e","Pentadecanoic acid (C15:0); f15d0","Pentadecanoic acid (C15:0); f15d0_e","Eicosatrienoic acid (C20:3n6); f20d3n6","Eicosatrienoic acid (C20:3n6); f20d3n6_e","Eicosapentaenoic acid (C20:5n3); f20d5n3","Eicosapentaenoic acid (C20:5n3); f20d5n3_e","Docosahexaenoic acid (C22:6n3); f22d6n3","Docosahexaenoic acid (C22:6n3); f22d6n3_e","Docosadienoic acid (C22:2); f22d2n6","Docosadienoic acid (C22:2); f22d2n6_e","Docosapentaenoic acid (C22:5n3); f22d5n3","Docosapentaenoic acid (C22:5n3); f22d5n3_e","Histidine; his","Histidine; his_e","Isoleucine; ile","Isoleucine; ile_e","Leucine; leu","Leucine; leu_e","Lysine; lys","Lysine; lys_e","Methionine; met","Methionine; met_e","Cysteine; cys","Cysteine; cys_e","Phenylalanine; phe","Phenylalanine; phe_e","Threonine; thr","Threonine; thr_e","Tryptophan; trp","Tryptophan; trp_e","Valine; val","Valine; val_e","Alanine; ala","Alanine; ala_e","Arginine; arg","Arginine; arg_e","Aspartic acid; asp","Aspartic acid; asp_e","Glucose; glu","Glucose; glu_e","Glycine; gly","Glycine; gly_e","Proline; pro","Proline; pro_e","Serine; ser","Serine; ser_e","Tyrosine; tyr","Tyrosine; tyr_e","Oxalates; oxalt","Oxalates; oxalt_e","Soluble Oxalate; oxals","Soluble Oxalate; oxals_e","Insoluble Oxalate; oxali","Insoluble Oxalate; oxali_e","Cis-Aconitic acid; caconac","Cis-Aconitic acid; caconac_e","Citric acid; citac","Citric acid; citac_e","Fumaric acid; fumac","Fumaric acid; fumac_e","Malic acid; malac","Malic acid; malac_e","Quinic acid; quinac","Quinic acid; quinac_e","Succinic acid; sucac","Succinic acid; sucac_e","Tartaric acid; tarac","Tartaric acid; tarac_e","3,4-Dihydroxy Benzoic acid; dhbenzac34","3,4-Dihydroxy Benzoic acid; dhbenzac34_e","3-Hydroxy Benzaldehyde; hbenzal3","3-Hydroxy Benzaldehyde; hbenzal3_e","Protocatechuic acid; pcathac","Protocatechuic acid; pcathac_e","Vanillic acid; vanlac","Vanillic acid; vanlac_e","Gallic acid; gallac","Gallic acid; gallac_e","Cinnamic acid; cinmac","Cinnamic acid; cinmac_e","o-Coumaric acid; coumaco","o-Coumaric acid; coumaco_e","p-Coumaric acid; coumacp","p-Coumaric acid; coumacp_e","Caffeic acid; caffac","Caffeic acid; caffac_e","Chlorogenic acid; chlrac","Chlorogenic acid; chlrac_e","Ferulic acid; ferac","Ferulic acid; ferac_e","Apigenin; apigen","Apigenin; apigen_e","Apigenin-6-C-gluoside; apigen6cgls","Apigenin-6-C-gluoside; apigen6cgls_e","Apigenin-7-O-neohesperidoside; apigen7onshps","Apigenin-7-O-neohesperidoside; apigen7onshps_e","Luteolin; luteol","Luteolin; luteol_e","Kaempferol; kaemf","Kaempferol; kaemf_e","Quercetin; querce","Quercetin; querce_e","Quercetin-3-β-D-glucoside; querce3bdgls","Quercetin-3-β-D-glucoside; querce3bdgls_e","Quercetin-3-O-rutinoside; querce3ortns","Quercetin-3-O-rutinoside; querce3ortns_e","Quercetin-3-β-galactoside; querce3bgls","Quercetin-3-β-galactoside; querce3bgls_e","Isorhamnetin; isormt","Isorhamnetin; isormt_e","Myricetin; myrct","Myricetin; myrct_e","Resvertrol; rsvrtol","Resvertrol; rsvrtol_e","Hesperetin; hespt","Hesperetin; hespt_e","Naringenin; narng","Naringenin; narng_e","Hesperdin; hespd","Hesperdin; hespd_e","Daidzein; daidzn","Daidzein; daidzn_e","Genistein; gnstein","Genistein; gnstein_e","(-)-Epicatechin; epicatec","(-)-Epicatechin; epicatec_e","(-)-Epigallo catechin; epicategc","(-)-Epigallo catechin; epicategc_e","(-)-Epigallo catechin 3-gallate; epicatgc3gal","(-)-Epigallo catechin 3-gallate; epicatgc3gal_e","(+)-Catechin; catec","(+)-Catechin; catec_e","(-)-Gallocatechin gallate; galcatecgal","(-)-Gallocatechin gallate; galcatecgal_e","(-)-Gallocatechin; galcatec","(-)-Gallocatechin; galcatec_e","Syringic acid; syrgac","Syringic acid; syrgac_e","Sinapinic acid; sinpac","Sinapinic acid; sinpac_e","Ellagic acid; ellgac","Ellagic acid; ellgac_e","Raffinose; rafs","Raffinose; rafs_e","Stachyose; stas","Stachyose; stas_e","Verbascose; vers","Verbascose; vers_e","Ajugose; ajgs","Ajugose; ajgs_e","Campesterol; camt","Campesterol; camt_e","Stigmasterol; stgstr","Stigmasterol; stgstr_e","β-Sitosterol; stostrb","β-Sitosterol; stostrb_e","Carotenes; carot","Carotenes; carot_e","Xanthophylls; xantp","Xanthophylls; xantp_e","β-Carotene equivalents; cartbeq","β-Carotene equivalents; cartbeq_e"
 "A001","Amaranth seed, black","Amaranthus cruentus","A. Moricha guti; H. Ramdana; Kan. Danthu beeja; Kash. Mawal; Mal. Cheera vithu; M. Chengkruk Maru; Mar. Cavali biya; O. Kosala sag manji Dhala; P. Chaulali beej; Tam. Keerai vidai; Tel. Thotakoora ginjalu.","Cereals and Millets",1,"vegetarian eggetarian fishetarian veg",1490,0,9.89,0,2.78,0,0.00152983,0,5.74,0,0,0,7.02,0,59.98,0,14.59,0,13.842992,0,0.000121,0,0.0125,0,0.07135,0,0.00037,0,0,0,0.35757,0,0.393,0,1.42,0,1.3157,0,0.01975346,0,0.000028,0,0.003333,0,0,0,0,0,0.00129936,0,0,0,0.00005867,0,0.00017,0,0.0000018,0,1.28,0,3.312,0,2.27991,0,3.31253,0,0,0,1.033,0,2.279,0,0.02091,0,2.259,0,1.03262,0,0,0,0,0,5.76,0,1.26,0,56.71,0,55.83,0,0,0,0.88,0,4.327394,0,3.571632,0,5.943966,0,0,0,0.00004,0,0.00004,0,0.00045,0,0.00024,0,0.0005,0,0.00000192,0,0.00002744,0,0.00005867,0,0,0,0,0,0.00005,0,0.00028,0,0.00004,0,0,0,0,0,0,0,0,0,0,0,0.0000018,0,0,0,0.00001025,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00332,0,0,0,0,0,0.181,0,0.001227,0,0.000059,0,0.00081,0,0.00933,0,0.000013,0,0.000028,0,0.325,0,0.00529,0,0,0,0.000016,0,0.000345,0,0.374,0,0.433,0,0.00001646,0,0.0027,0,0.00266,0,0.1,0,0.22,0,0.46,0,0.1,0,0,0,0,0,0,0,0,0,0,0,0,0,0.01564,0,1.043,0,0.155,0,0.038,0,0.01607,0,0.01214,0,0,0,0,0,1.02,0,0,0,0.01262,0,0,0,0,0,2.259,0,0,0,0.02091,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.271374,0,0.411438,0,0.704697,0,0.795155,0,0.271374,0,0.23344,0,0.580682,0,0.440618,0,0.21885,0,0.633206,0,0.621534,0,1.133643,0,1.833963,0,2.351908,0,1.24015,0,0.548584,0,1.136561,0,0.415815,0,0.226,0,0.03743,0,0.188,0,0,0,0.00864,0,0.00015,0,0.04578,0,0.07553,0,0.00147,0,0,0,0.00128,0,0,0,0.00021,0,0.00006,0,0,0,0,0,0,0,0.00006,0,0.00003,0,0.00021,0,0.00213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00175,0,0.00824,0,0.06136,0,0,0,0.00001025,0,0,0
 "A002","Amaranth seed, pale brown","Amaranthus cruentus","A. Moricha guti; G. Rajagaro; H. Ramdana; Kan. Danthu beeja; Kash. Mawal; Mal. Cheera vithu; M. Chengkruk Maru; Mar. Cavali biya; O. Kosala sag maji kale; P. Chaulali beej; Tam. Keerai vidai; Tel. Thotakoora ginjalu.","Cereals and Millets",6,"vegetarian eggetarian fishetarian veg",1489,10,9.2,0.4,3.05,0.3,0.001443,0.0001547,5.56,0.33,0,0,7.47,0.09,61.46,0.6,13.27,0.34,12.748489,1.24738,0.00005968,0.00000309,0.01175,0.00248,0.07024,0.00201,0.00031,0.00011,0,0,0.34132,0.05253,0.341,0.0139,1.28,0.21,1.25981,0.11702,0.01577141,0.00157715,0.000008,0.000008,0.002749,0.000482,0,0,0,0,0.00123652,0.00012045,0,0,0.00005398,0.00000338,0.00015,0.00003,0.0000025,8.7e-7,1.14,0.0705,3.309,0.1978,2.26603,0.1317,3.30874,0.19756,0,0,1.043,0.0658,2.266,0.132,0.04303,0.0027,2.223,0.129,1.04271,0.06586,0,0,0,0,5.8,0.17,1.67,0.21,60.13,1.3,59.33,1.31,0,0,0.8,0.07,4.107065,0.287959,3.175511,0.29194,5.465913,0.667481,0,0,0.00004,0.000007,0.00004,0.000007,0.00052,0.00005,0.00028,0.00003,0.00033,0.000023,0.00000187,2.4e-7,0.00002465,0.00000321,0.00005398,0.00000338,0,0,0,0,0.00006,0,0.00022,0.0001,0.00003,0.00001,0,0,0,0,0,0,0,0,0,0,0.0000025,8.7e-7,0,0,0.00000411,0.00000116,0,0,0,0,0,0,0,0,0,0,0,0,0.00273,0.00047,0,0,0.000001,0,0.162,0.0157,0.000092,0.000045,0.000021,0.000005,0.00056,0.00009,0.00802,0.00093,0.000018,0.000012,0.000008,0.000008,0.27,0.0332,0.00444,0.00027,0,0,0.000049,0.000014,0.000048,0.000017,0.412,0.022,0.413,0.0459,0.00002141,0.00000615,0.00281,0.00022,0.00252,0.0002,0.1,0.01,0.22,0.04,0.48,0.04,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.01068,0.00135,0.891,0.0545,0.172,0.0141,0.03602,0.00268,0.01561,0.00131,0.01351,0.00206,0,0,0,0,1.03,0.0643,0,0,0.01271,0.00156,0,0,0,0,2.223,0.129,0,0,0.04303,0.0027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.262746,0.06635,0.378195,0.005308,0.655538,0.022559,0.72985,0.046445,0.258765,0.015924,0.200377,0.019905,0.630325,0.054407,0.396773,0.027867,0.224263,0.01327,0.57061,0.035829,0.508241,0.084928,0.956767,0.120757,1.68529,0.298575,2.307653,0.222936,1.098756,0.046445,0.508241,0.059715,0.964729,0.061042,0.41137,0.045118,0.209,0.0497,0.0323,0.00146,0.177,0.0498,0.00014,0.00002,0.00793,0.00045,0.00014,0.00002,0.04716,0.00164,0.07506,0.00057,0.00189,0.00013,0,0,0.00123,0.00005,0,0,0.00026,0.00003,0.00004,0.00002,0,0,0,0,0,0,0.00004,0.00003,0.00003,0.00002,0.0001,0.00005,0.00059,0.00076,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.00158,0.00015,0.00851,0.00037,0.06015,0.00149,0,0,0.00000411,0.00000116,0,0
 "A003","Bajra","Pennisetum typhoideum","A., Kash. Baajra; B. Bajra; E. Pearl millet; G. Bajri; H. Bajra; Kan. Sajje; Kh. Krai; Mal. Kambam; Mar. Bajra; N. Bajara; O. Bajra; P. Bajra; Tam. Kambu; Tel. Sajjalu; U. Bajra.","Cereals and Millets",6,"vegetarian eggetarian fishetarian veg",1456,18,8.97,0.6,1.37,0.17,0.00239348,0.00027642,5.43,0.64,0,0,11.49,0.62,61.78,0.85,10.96,0.26,9.697408,1.333832,0.000293,0.0000557,0.06771,0.00589,0.09668,0.00386,0.00152,0.00021,0,0,0.05608,0.00618,0.485,0.0121,0,0,0.80946,0.06505,0.01103237,0.00175346,0.000003,0.000001,0.002221,0.000783,7.7e-7,0.00000148,0.00002823,0.00000942,0.00211675,0.0002461,0,0,0.00000565,2.7e-7,0.00024,0.00002,0.00000285,6.3e-7,0.875,0.0345,3.031,0.0949,1.984,0.0625,3.03097,0.10275,0,0,1.047,0.0399,1.984,0.055,0.14,0.0058,1.844,0.0567,1.04,0.0398,0,0,0.00697,0.00045,9.14,0.58,2.34,0.42,56.02,2.57,55.21,2.57,0.09,0.043,0.81,0.01,3.716536,0.644448,1.891696,0.207144,4.089176,0.48224,0,0,0.00025,0.000044,0.0002,0.000038,0.00086,0.0001,0.0005,0.00005,0.00027,0.000009,6.4e-7,5e-8,0.00003611,0.00000505,0.00000565,2.7e-7,0,0,0,0,0.0001,0.00001,0,0,0.00142,0.0002,0,0,0,0,0,0,0,0,0,0,0.00000285,6.3e-7,0,0,0.00002969,0.00000872,0.0000093,0.00000123,0,0,0,0,0,0,0,0,0.00002823,0.00000942,0.00221,0.00078,9.7e-7,2.4e-7,0.000003,0.000001,0.02735,0.00216,0.000025,0.000006,0.00003,0.000015,0.00054,0.00011,0.00642,0.00104,0.000008,0.000002,0.000003,0.000001,0.124,0.0195,0.00112,0.00017,7.7e-7,0.00000148,0.00005,0.000025,0.000056,0.000022,0.289,0.0253,0.365,0.018,0.0000304,0.00000522,0.00411,0.00009,0.00276,0.00036,0.21,0.01,0.6,0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.729,0.0213,0.128,0.0196,0.01821,0.00278,0,0,0,0,0,0,0.00697,0.00045,1.04,0.0398,0,0,0,0,0,0,0,0,1.844,0.0567,0,0,0.14,0.0058,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.23564,0.040552,0.37812,0.081104,0.933792,0.094256,0.349624,0.053704,0.231256,0.0548,0.134808,0.036168,0.528272,0.129328,0.38908,0.04384,0.145768,0.03288,0.524984,0.113984,0.841728,0.110696,0.497584,0.067952,0.851592,0.141384,1.909232,0.185224,0.385792,0.018632,0.58088,0.028496,0.486624,0.044936,0.292632,0.055896,0.05313,0.00534,0.04349,0.0039,0.00988,0.00836,0.00008,0.00003,0,0,0.00199,0.00059,0.00086,0.00021,0,0,0.00002,0.00001,0,0,0.00003,0.00001,0.00011,0.00002,0,0,0,0,0,0,0,0,0,0,0.00007,0.00002,0.00025,0.00001,0.00008,0.00001,0.00139,0.00024,0,0,0,0,0,0,0.00111,0.00038,0.00014,0.00002,0,0,0,0,0,0,0,0,0.0003,0.00004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.08,0.039,0.01,0.004,0,0,0,0,0.01584,0.00136,0.00497,0.00025,0.07587,0.00225,0.00002823,0.00000942,0.00003899,0.00000995,0.00002823,0.00000942
diff --git a/index.js b/index.js
index 721e131..2c2e2de 100644
--- a/index.js
+++ b/index.js
@@ -87,8 +87,9 @@ function sql(tab='compositions', opt={}) {
   return new Promise((resolve, reject) => {
     stream.on('error', reject);
     stream.on('data', (r) => {
-      if (++i===0) { cols = r; a = createTable(tab, cols, opt, a); a = insertIntoBegin(tab, cols, a); }
-      a = insertIntoMid(r, a);
+      var x = fixColumns(r);
+      if (++i===0) { cols = x; a = createTable(tab, cols, opt, a); a = insertIntoBegin(tab, cols, a); }
+      a = insertIntoMid(x, a);
     });
     stream.on('end', () => {
       a  = insertIntoEnd(a);
@@ -104,11 +105,24 @@ function sql(tab='compositions', opt={}) {
 
 
 
-function loadRow(row) {
+// Fix column names of a row in the CSV file.
+function fixColumns(row) {
   var a = {};
   for (var k in row) {
-    if (TEXTCOLS.has(k)) a[k] = row[k];
-    else a[k] = parseFloat(row[k]);
+    // Name of column is after the last semicolon.
+    var l = k.substring(k.lastIndexOf(';')+1).trim();
+    a[l]  = row[k];
+  }
+  return a;
+}
+
+
+// Parse a row from the CSV file.
+function parseRow(row) {
+  var a = {};
+  for (var k in row) {
+    var l = k.substring(k.lastIndexOf(';')+1).trim();
+    a[l]  = TEXTCOLS.has(l)? row[k] : parseFloat(row[k]);
   }
   return a;
 }
@@ -116,7 +130,7 @@ function loadRow(row) {
 function loadCorpus() {
   return new Promise((fres) => {
     var s = fs.createReadStream(csv()).pipe(csvx.parse({columns: true, comment: '#'}));
-    s.on('data', (r) => corpus.set(r.code, loadRow(r)));
+    s.on('data', (r) => { var x = parseRow(r); corpus.set(x.code, x); });
     s.on('end', fres);
   });
 }
diff --git a/package-lock.json b/package-lock.json
index a302b95..c60f4e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,11 +14,22 @@
         "sql-extra": "^0.1.13"
       },
       "devDependencies": {
+        "@ifct2017/columns": "^2.0.13",
         "@ifct2017/descriptions": "^2.0.7",
         "@ifct2017/groups": "^2.0.11",
         "extra-build": "^2.2.29"
       }
     },
+    "node_modules/@ifct2017/columns": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@ifct2017/columns/-/columns-2.0.13.tgz",
+      "integrity": "sha512-59J9wJlnfm77BUTitVIqFy7UE+qGRwIyjGD061VWHNok4vkQsJGcPydRs6FVBNANhWV8QMnKR3fHSHcyemEIzw==",
+      "dev": true,
+      "dependencies": {
+        "lunr": "^2.3.9",
+        "sql-extra": "^0.1.13"
+      }
+    },
     "node_modules/@ifct2017/descriptions": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@ifct2017/descriptions/-/descriptions-2.0.7.tgz",
@@ -478,6 +489,16 @@
     }
   },
   "dependencies": {
+    "@ifct2017/columns": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@ifct2017/columns/-/columns-2.0.13.tgz",
+      "integrity": "sha512-59J9wJlnfm77BUTitVIqFy7UE+qGRwIyjGD061VWHNok4vkQsJGcPydRs6FVBNANhWV8QMnKR3fHSHcyemEIzw==",
+      "dev": true,
+      "requires": {
+        "lunr": "^2.3.9",
+        "sql-extra": "^0.1.13"
+      }
+    },
     "@ifct2017/descriptions": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@ifct2017/descriptions/-/descriptions-2.0.7.tgz",
diff --git a/package.json b/package.json
index fe7088b..756588b 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
   },
   "homepage": "https://github.com/ifct2017/compositions#readme",
   "devDependencies": {
+    "@ifct2017/columns": "^2.0.13",
     "@ifct2017/descriptions": "^2.0.7",
     "@ifct2017/groups": "^2.0.11",
     "extra-build": "^2.2.29"