diff --git a/main.js b/main.js
index 838922da..be051d02 100644
--- a/main.js
+++ b/main.js
@@ -453,7 +453,7 @@ function invokeActiveZooming() {
       const size = this.getAttribute("font-size") * scale;
       const hidden = size < 25 || size > 300;
       if (hidden) this.classList.add("hidden"); else this.classList.remove("hidden");
-      if (!hidden && this.children.length && !this.children[0].getAttribute("href")) renderGroupCOAs(this);
+      if (!hidden && COArenderer && this.children.length && !this.children[0].getAttribute("href")) renderGroupCOAs(this);
     });
   }
 
diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index f2d7c59e..b53dd351 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -913,10 +913,10 @@
 
     const forms = {
       Monarchy:{County:11, Earldom:3, Shire:1, Landgrave:1, Margrave:1, Barony:1},
-      Republic:{Province:6, Department:2, Governorate:2, State:1, Canton:1, Prefecture:1},
-      Theocracy:{Parish:5, Deanery:3, Province:2, Council:1, District:1},
-      Union:{Province:2, State:1, Canton:1, Republic:1, County:1},
-      Wild:{Territory:10, Land:5, Province:2, Region:2, Tribe:1, Clan:1},
+      Republic:{Province:6, Department:2, Governorate:2, District:1, Canton:1, Prefecture:1},
+      Theocracy:{Parish:3, Deanery:1},
+      Union:{Province:1, State:1, Canton:1, Republic:1, County:1, Council:1},
+      Wild:{Territory:10, Land:5, Region:2, Tribe:1, Clan:1, Dependency:1, Area: 1},
       Horde:{Horde:1}
     }
 
diff --git a/modules/coa-generator.js b/modules/coa-generator.js
index 6d1c62e7..2cf3de72 100644
--- a/modules/coa-generator.js
+++ b/modules/coa-generator.js
@@ -200,7 +200,6 @@
     // old versions auto migration: coa generation for cultures and states etc.
     // emblems layer for old maps
     // define emblems layer style for all styles
-    // generatate state/prov/burg - remove all rendered coas
     // style settings for emblems layer
     // fix map download svg/png
     // test in FF
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index 5e9a96fe..10e3b5df 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -117,6 +117,11 @@ function regenerateStates() {
     b.capital = 0;
   });
 
+  // remove emblems
+  document.querySelectorAll("[id^=stateCOA]").forEach(el => el.remove());
+  document.querySelectorAll("[id^=provinceCOA]").forEach(el => el.remove());
+  emblems.selectAll("use").remove();
+
   unfog();
 
   // if desired states number is 0
@@ -131,11 +136,6 @@ function regenerateStates() {
     labels.select("#states").selectAll("text"); // remove state labels
     defs.select("#textPaths").selectAll("path[id*='stateLabel']").remove(); // remove state labels paths
 
-    // remove emblems
-    document.querySelectorAll("[id^=stateCOA]").forEach(el => el.remove());
-    document.querySelectorAll("[id^=provinceCOA]").forEach(el => el.remove());
-    emblems.selectAll("use").remove();
-
     if (document.getElementById("burgsOverviewRefresh").offsetParent) burgsOverviewRefresh.click();
     if (document.getElementById("statesEditorRefresh").offsetParent) statesEditorRefresh.click();
     return;
@@ -193,9 +193,15 @@ function regenerateStates() {
 
 function regenerateProvinces() {
   unfog();
+
   BurgsAndStates.generateProvinces(true);
   drawBorders();
   if (layerIsOn("toggleProvinces")) drawProvinces();
+
+  // remove emblems
+  document.querySelectorAll("[id^=provinceCOA]").forEach(el => el.remove());
+  emblems.selectAll("use").remove();
+  if (layerIsOn("toggleEmblems")) drawEmblems();
 }
 
 function regenerateBurgs() {
@@ -247,6 +253,11 @@ function regenerateBurgs() {
   BurgsAndStates.drawBurgs();
   Routes.regenerate();
 
+  // remove emblems
+  document.querySelectorAll("[id^=burgCOA]").forEach(el => el.remove());
+  emblems.selectAll("use").remove();
+  if (layerIsOn("toggleEmblems")) drawEmblems();
+
   if (document.getElementById("burgsOverviewRefresh").offsetParent) burgsOverviewRefresh.click();
   if (document.getElementById("statesEditorRefresh").offsetParent) statesEditorRefresh.click();
 }