diff --git a/message_ix_models/model/water/data/water_supply.py b/message_ix_models/model/water/data/water_supply.py
index 471513c35..517316151 100644
--- a/message_ix_models/model/water/data/water_supply.py
+++ b/message_ix_models/model/water/data/water_supply.py
@@ -54,7 +54,7 @@ def map_basin_region_wat(context: "Context") -> pd.DataFrame:
         df_sw["MSGREG"] = (
             context.map_ISO_c[context.regions]
             if context.type_reg == "country"
-            else f"{context.regions}_" + df_sw["BCU_name"].str[-3:]
+            else f"{context.regions}_" + df_sw["BCU_name"].str.split("|").str[-1]
         )
 
         df_sw = df_sw.set_index(["MSGREG", "BCU_name"])
@@ -97,7 +97,9 @@ def map_basin_region_wat(context: "Context") -> pd.DataFrame:
         if context.type_reg == "country":
             df_sw["MSGREG"] = context.map_ISO_c[context.regions]
         else:
-            df_sw["MSGREG"] = f"{context.regions}_" + df_sw["BCU_name"].str[-3:]
+            df_sw["MSGREG"] = (
+                f"{context.regions}_" + df_sw["BCU_name"].str.split("|").str[-1]
+            )
 
         df_sw = df_sw.set_index(["MSGREG", "BCU_name"])
         df_sw.drop(columns="Unnamed: 0", inplace=True)
diff --git a/message_ix_models/model/water/report.py b/message_ix_models/model/water/report.py
index 39ee421ee..15e9b3910 100644
--- a/message_ix_models/model/water/report.py
+++ b/message_ix_models/model/water/report.py
@@ -1113,7 +1113,7 @@ def report(sc: Scenario, reg: str, sdgs: bool = False) -> None:
     for ur in ["urban", "rural"]:
         # CHANGE TO URBAN AND RURAL POP
         pop_tot = sc.timeseries(variable=("Population|" + ur.capitalize()))
-        pop_tot = pop_tot[-(pop_tot.region == "GLB region (R11)")]
+        pop_tot = pop_tot[-(pop_tot.region == "GLB region (R11)")]  # ONLY R11!!!
         pop_reg = np.unique(pop_tot["region"])
         # need to change names
         reg_map = mp2.regions()