diff --git a/tools/langs/langs.go b/tools/langs/langs.go
index c1bbe90..acfb811 100644
--- a/tools/langs/langs.go
+++ b/tools/langs/langs.go
@@ -7,6 +7,7 @@
 	"log"
 	"net/http"
 	"os"
+	"strings"
 )
 
 const isoLangsFileName = "isoLangs.json"
@@ -21,6 +22,12 @@
 	for currLangCode, currLang := range isoLangs {
 		if currLangCode == lang {
 			currLang.CodeName = lang
+
+			// Only consider the first entry of the list (e.g. "a, b, c" --> "a")
+			if index := strings.Index(currLang.NativeName, ","); index > 0 {
+				currLang.NativeName = currLang.NativeName[:index]
+			}
+
 			return currLang, nil
 		}
 	}