diff --git a/index.html b/index.html
index 51d1c0d9..5efbb5e3 100644
--- a/index.html
+++ b/index.html
@@ -7876,7 +7876,7 @@
     <script defer src="modules/ui/heightmap-editor.js?v=1.89.06"></script>
     <script defer src="modules/ui/provinces-editor.js?v=1.89.00"></script>
     <script defer src="modules/ui/biomes-editor.js"></script>
-    <script defer src="modules/ui/namesbase-editor.js?v=1.87.10"></script>
+    <script defer src="modules/ui/namesbase-editor.js?v=1.89.25"></script>
     <script defer src="modules/ui/elevation-profile.js"></script>
     <script defer src="modules/ui/temperature-graph.js"></script>
     <script defer src="modules/ui/routes-editor.js?v=1.89.04"></script>
diff --git a/modules/ui/namesbase-editor.js b/modules/ui/namesbase-editor.js
index e2d214ff..07cb1403 100644
--- a/modules/ui/namesbase-editor.js
+++ b/modules/ui/namesbase-editor.js
@@ -23,23 +23,11 @@ function editNamesbase() {
 
   const uploader = document.getElementById("namesbaseToLoad");
   document.getElementById("namesbaseUpload").addEventListener("click", () => {
-    uploader.addEventListener(
-      "change",
-      function (event) {
-        uploadFile(event.target, d => namesbaseUpload(d, true));
-      },
-      {once: true}
-    );
+    uploader.addEventListener("change", e => uploadFile(e.target, d => namesbaseUpload(d, true)), {once: true});
     uploader.click();
   });
   document.getElementById("namesbaseUploadExtend").addEventListener("click", () => {
-    uploader.addEventListener(
-      "change",
-      function (event) {
-        uploadFile(event.target, d => namesbaseUpload(d, false));
-      },
-      {once: true}
-    );
+    uploader.addEventListener("change", e => uploadFile(e.target, d => namesbaseUpload(d, false)), {once: true});
     uploader.click();
   });
 
@@ -92,11 +80,13 @@ function editNamesbase() {
 
   function updateNamesData() {
     const base = +document.getElementById("namesbaseSelect").value;
-    const rawInput = document.getElementById("namesbaseTextarea").value;
-    if (rawInput.split(",").length < 3) return tip("The names data provided is too short of incorrect", false, "error");
+    const input = document.getElementById("namesbaseTextarea");
+    if (input.value.split(",").length < 3)
+      return tip("The names data provided is too short of incorrect", false, "error");
 
-    const namesData = rawInput.replace(/[/|]/g, "");
-    nameBases[base].b = namesData;
+    const securedNamesData = input.value.replace(/[/|]/g, "");
+    nameBases[base].b = securedNamesData;
+    input.value = securedNamesData;
     Names.updateChain(base);
   }
 
@@ -113,19 +103,13 @@ function editNamesbase() {
 
   function updateBaseMin() {
     const base = +document.getElementById("namesbaseSelect").value;
-    if (+this.value > nameBases[base].max) {
-      tip("Minimal length cannot be greater than maximal", false, "error");
-      return;
-    }
+    if (+this.value > nameBases[base].max) return tip("Minimal length cannot be greater than maximal", false, "error");
     nameBases[base].min = +this.value;
   }
 
   function updateBaseMax() {
     const base = +document.getElementById("namesbaseSelect").value;
-    if (+this.value < nameBases[base].min) {
-      tip("Maximal length should be greater than minimal", false, "error");
-      return;
-    }
+    if (+this.value < nameBases[base].min) return tip("Maximal length should be greater than minimal", false, "error");
     nameBases[base].max = +this.value;
   }
 
@@ -256,16 +240,14 @@ function editNamesbase() {
 
   function namesbaseUpload(dataLoaded, override = true) {
     const data = dataLoaded.split("\r\n");
-    if (!data || !data[0]) {
-      tip("Cannot load a namesbase. Please check the data format", false, "error");
-      return;
-    }
+    if (!data || !data[0]) return tip("Cannot load a namesbase. Please check the data format", false, "error");
 
     Names.clearChains();
     if (override) nameBases = [];
     data.forEach(d => {
-      const e = d.split("|");
-      nameBases.push({name: e[0], min: e[1], max: e[2], d: e[3], m: e[4], b: e[5]});
+      const [name, min, max, d, m, names] = d.split("|");
+      const secureNames = names.replace(/[/|]/g, "");
+      nameBases.push({name, min, max, d, m, b: secureNames});
     });
 
     createBasesList();
diff --git a/versioning.js b/versioning.js
index e08e6340..4fc8b3e3 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // version and caching control
-const version = "1.89.24"; // generator version, update each time
+const version = "1.89.25"; // generator version, update each time
 
 {
   document.title += " v" + version;