diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml
index 5ed0efa100..21e924e320 100644
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -479,7 +479,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
@@ -493,6 +493,13 @@ Rules:
 		-ActorLostNotification:
 	^CivBuilding:
 		AnnounceOnSeen:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	OLDLST:
 		Inherits: LST
 		-WithRoof:
diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
index d14e5433f1..c85290ca17 100644
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -780,7 +780,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml
index bc07eaa477..79f3a4a699 100644
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -839,7 +839,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
@@ -854,6 +854,14 @@ Rules:
 	^CivInfantry:
 		Health:
 			HP: 125
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	^Bridge:
 		DamageMultiplier@INVULNERABLE:
 			Modifier: 0
diff --git a/mods/cnc/maps/gdi06/map.yaml b/mods/cnc/maps/gdi06/map.yaml
index 22846bb22c..81b03ca1ac 100644
--- a/mods/cnc/maps/gdi06/map.yaml
+++ b/mods/cnc/maps/gdi06/map.yaml
@@ -1123,7 +1123,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
index 8ef8c6f7cb..cfc11bfb25 100644
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -314,6 +314,13 @@ Rules:
 			Modifier: 0
 	^CivBuilding:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	^CivInfantry:
 		MustBeDestroyed:
 	^Vehicle:
@@ -350,7 +357,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml
index 7d09121407..18b329e259 100644
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -516,7 +516,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml
index 9928017bb3..47f3be57e7 100644
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -560,7 +560,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml
index 98cbbd840d..7e407d9333 100644
--- a/mods/cnc/maps/nod04a/map.yaml
+++ b/mods/cnc/maps/nod04a/map.yaml
@@ -625,17 +625,19 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
 			ShowOwnerRow: false
 	^CivBuilding:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 		AnnounceOnSeen:
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 		AnnounceOnSeen:
 	^CommonHuskDefaults:
diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml
index 7c76ac497b..1b3f1f62ba 100644
--- a/mods/cnc/maps/nod04b/map.yaml
+++ b/mods/cnc/maps/nod04b/map.yaml
@@ -555,16 +555,18 @@ Rules:
 			PlayerPalette: player-units
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
 			ShowOwnerRow: false
 	^CivBuilding:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml
index a924b2efe0..83187b6a57 100644
--- a/mods/cnc/maps/nod05/map.yaml
+++ b/mods/cnc/maps/nod05/map.yaml
@@ -459,7 +459,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml
index a9f8dadfe9..c960036aef 100644
--- a/mods/cnc/maps/nod06a/map.yaml
+++ b/mods/cnc/maps/nod06a/map.yaml
@@ -730,7 +730,11 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
@@ -740,6 +744,7 @@ Rules:
 			PlayerPalette: player-units
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	HARV:
 		Harvester:
diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml
index ef9dc2a256..3872aa3f54 100644
--- a/mods/cnc/maps/nod06b/map.yaml
+++ b/mods/cnc/maps/nod06b/map.yaml
@@ -673,7 +673,11 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
@@ -683,6 +687,7 @@ Rules:
 			PlayerPalette: player-units
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	FLARE:
 		Tooltip:
diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml
index cfa1432516..1584ff9192 100644
--- a/mods/cnc/maps/nod06c/map.yaml
+++ b/mods/cnc/maps/nod06c/map.yaml
@@ -557,7 +557,11 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
@@ -565,6 +569,10 @@ Rules:
 			ShowOwnerRow: false
 		RenderSprites:
 			PlayerPalette: player-units
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	^Bridge:
 		DamageMultiplier@INVULNERABLE:
 			Modifier: 0