diff --git a/core/src/com/unciv/models/ruleset/nation/Nation.kt b/core/src/com/unciv/models/ruleset/nation/Nation.kt
index b35c3b75ea..dd0bd8137d 100644
--- a/core/src/com/unciv/models/ruleset/nation/Nation.kt
+++ b/core/src/com/unciv/models/ruleset/nation/Nation.kt
@@ -267,8 +267,7 @@ class Nation : RulesetObject() {
             in Constants.all -> true
             name -> true
             "Major" -> isMajorCiv
-            // "CityState" to be deprecated, replaced by "City-States"
-            "CityState", Constants.cityStates -> isCityState
+            Constants.cityStates, "City-State" -> isCityState
             else -> uniques.contains(filter)
         }
     }
diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
index 16ec7d26cf..dd37b85558 100644
--- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
+++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
@@ -230,7 +230,7 @@ enum class UniqueParameterType(
 
     /** Implemented by [Nation.matchesFilter][com.unciv.models.ruleset.nation.Nation.matchesFilter] */
     NationFilter("nationFilter", Constants.cityStates) {
-        override val staticKnownValues = setOf(Constants.cityStates, "Major") + Constants.all
+        override val staticKnownValues = setOf(Constants.cityStates, "City-State", "Major") + Constants.all
 
         override fun getErrorSeverity(parameterText: String, ruleset: Ruleset) = getErrorSeverityForFilter(parameterText, ruleset)
 
diff --git a/docs/Modders/Unique-parameters.md b/docs/Modders/Unique-parameters.md
index ce461b7abb..35d9621f19 100644
--- a/docs/Modders/Unique-parameters.md
+++ b/docs/Modders/Unique-parameters.md
@@ -47,7 +47,7 @@ Allows filtering for specific nations. Used by [ModOptions.nationsToRemove](Mod-
 Allowed values:
 
 - `All`
-- `City-states`
+- `City-States`, `City-State`
 - `Major`
 - Nation name
 - A unique a Nation has (verbatim, no placeholders)
@@ -309,6 +309,7 @@ Allowed values:
 
 - `year`, `turns`
 - `Cities`, `[cityFilter] Cities`
+- `City-States` - counts all undefeated city-states
 - `Units`, `[mapUnitFilter] Units`
 - `[buildingFilter] Buildings`
 - Stat name - gets the stat *reserve*, not the amount per turn (can be city stats or civilization stats, depending on where the unique is used)