diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index abecbf61c5..bd64c77cd3 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -3336,20 +3336,11 @@ Send your best explorers on a quest to discover Natural Wonders. Nobody knows th
 
 #################### Lines from Religions from Civ V - Vanilla ####################
 
- # Requires translation!
-Buddhism = 
-
- # Requires translation!
-Christianity = 
-
- # Requires translation!
-Hinduism = 
-
- # Requires translation!
-Islam = 
-
- # Requires translation!
-Taoism = 
+Buddhism = Buddhismus
+Christianity = Christentum
+Hinduism = Hinduismus
+Islam = Islam
+Taoism = Taoismus
 
 
 #################### Lines from Specialists from Civ V - Vanilla ####################
diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index 3929ef45d0..a6368eeb2c 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -89,11 +89,14 @@ class MapUnit {
 
     /**
      * Name which should be displayed in UI
+     * 
+     * Note this is translated after being returned from this function, so let's pay
+     * attention to combined names (renamed units, religion).
      */
     fun displayName(): String {
         val name = if (instanceName == null) name
-                   else "$instanceName (${name})"
-        return if (religion != null && maxReligionSpreads() > 0) "$name ($religion)"
+                   else "$instanceName ({${name}})"
+        return if (religion != null && maxReligionSpreads() > 0) "[$name] ([$religion])"
                else name
     }
 
diff --git a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt b/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
index e6f13dbe96..140b3f8535 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt
@@ -18,8 +18,6 @@ class IdleUnitButton (
 
     val image = ImageGetter.getImage("OtherIcons/BackArrow")
 
-    fun hasIdleUnits() = unitTable.worldScreen.viewingCiv.getIdleUnits().any()
-
     init {
         val imageSize = 25f
         if(!previous) {
diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
index 11ab14d35f..8c1c039c19 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
@@ -91,7 +91,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
                 val position = selectedUnit?.currentTile?.position
                     ?: selectedCity?.location
                 if (position != null)
-                    worldScreen.mapHolder.setCenterPosition(position, false, false)
+                    worldScreen.mapHolder.setCenterPosition(position, immediately = false, selectUnit = false)
             }
         }).expand()
 
@@ -109,7 +109,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
             }
         }
 
-        if (prevIdleUnitButton.hasIdleUnits()) { // more efficient to do this check once for both
+        if (worldScreen.viewingCiv.getIdleUnits().any()) { // more efficient to do this check once for both
             prevIdleUnitButton.enable()
             nextIdleUnitButton.enable()
         } else {