diff --git a/core/src/com/unciv/models/ruleset/Policy.kt b/core/src/com/unciv/models/ruleset/Policy.kt
index 596ad3c3c1..0da35bf3a3 100644
--- a/core/src/com/unciv/models/ruleset/Policy.kt
+++ b/core/src/com/unciv/models/ruleset/Policy.kt
@@ -56,7 +56,7 @@ open class Policy : RulesetObject() {
                     || it.type == UniqueType.OnlyAvailable
                     || it.type == UniqueType.OneTimeGlobalAlert
             }
-            .joinToString("\n") { "• ${it.text.tr()}" }
+            .joinToString("\n") { "• ${it.getDisplayText().tr()}" }
     }
 
     override fun makeLink() = "Policy/$name"
diff --git a/core/src/com/unciv/ui/objectdescriptions/BaseUnitDescriptions.kt b/core/src/com/unciv/ui/objectdescriptions/BaseUnitDescriptions.kt
index 9e1bbd8b63..db16b2cf2b 100644
--- a/core/src/com/unciv/ui/objectdescriptions/BaseUnitDescriptions.kt
+++ b/core/src/com/unciv/ui/objectdescriptions/BaseUnitDescriptions.kt
@@ -292,7 +292,7 @@ object BaseUnitDescriptions {
         val lostAbilityPredicate: (Unique)->Boolean = { it.text in betterUnit.uniques || it.isHiddenToUsers() }
         for (unique in originalUnit.uniqueObjects.filterNot(lostAbilityPredicate)) {
             // Need double translation of the "ability" here - unique texts may contain nuts - pardon, square brackets
-            yield("Lost ability (vs [${originalUnit.name}]): [${unique.text.tr()}]" to null)
+            yield("Lost ability (vs [${originalUnit.name}]): [${unique.getDisplayText().tr()}]" to null)
         }
         for (promotionName in betterUnit.promotions.filter { it !in originalUnit.promotions }) {
             val promotion = ruleset.unitPromotions[promotionName]!!
diff --git a/core/src/com/unciv/ui/objectdescriptions/BuildingDescriptions.kt b/core/src/com/unciv/ui/objectdescriptions/BuildingDescriptions.kt
index 67d003fe5e..c108bda359 100644
--- a/core/src/com/unciv/ui/objectdescriptions/BuildingDescriptions.kt
+++ b/core/src/com/unciv/ui/objectdescriptions/BuildingDescriptions.kt
@@ -269,7 +269,7 @@ object BuildingDescriptions {
                 if (!tileBonusHashmap.containsKey(stats)) tileBonusHashmap[stats] = ArrayList()
                 tileBonusHashmap[stats]!!.add(unique.params[1])
             }
-            else -> yield(unique.text)
+            else -> yield(unique.getDisplayText())
         }
         for ((key, value) in tileBonusHashmap)
             yield( "[stats] from [tileFilter] tiles in this city"
diff --git a/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt b/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt
index 8b7076e403..685ed011e9 100644
--- a/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt
+++ b/core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt
@@ -204,7 +204,7 @@ class CivilopediaScreen(
         fun shouldBeDisplayed(obj: ICivilopediaText) =
             obj is IHasUniques && !obj.isHiddenFromCivilopedia(game.gameInfo, ruleset)
 
-        for (loopCategory in CivilopediaCategories.values()) {
+        for (loopCategory in CivilopediaCategories.entries) {
             if (!religionEnabled && loopCategory == CivilopediaCategories.Belief) continue
             categoryToEntries[loopCategory] =
                 loopCategory.getCategoryIterator(ruleset, tutorialController)