diff --git a/Content.Server/Administration/Systems/AdminTestArenaSystem.cs b/Content.Server/Administration/Systems/AdminTestArenaSystem.cs
index 181c1a623d..07fc628bce 100644
--- a/Content.Server/Administration/Systems/AdminTestArenaSystem.cs
+++ b/Content.Server/Administration/Systems/AdminTestArenaSystem.cs
@@ -35,7 +35,7 @@ public sealed class AdminTestArenaSystem : EntitySystem
         }
 
         ArenaMap[admin.UserId] = _mapManager.GetMapEntityId(_mapManager.CreateMap());
-        var grids = _map.LoadMap(Comp<MapComponent>(ArenaMap[admin.UserId]).WorldMap, ArenaMapPath);
+        var grids = _map.LoadMap(Comp<MapComponent>(ArenaMap[admin.UserId]).MapId, ArenaMapPath);
         ArenaGrid[admin.UserId] = grids.Count == 0 ? null : grids[0];
 
         return (ArenaMap[admin.UserId], ArenaGrid[admin.UserId]);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 1f8a25fd85..e0774fb16f 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -696,7 +696,7 @@ public sealed partial class AdminVerbSystem
         {
             if (_adminManager.HasAdminFlag(player, AdminFlags.Mapping))
             {
-                if (_mapManager.IsMapPaused(map.WorldMap))
+                if (_mapManager.IsMapPaused(map.MapId))
                 {
                     Verb unpauseMap = new()
                     {
@@ -705,7 +705,7 @@ public sealed partial class AdminVerbSystem
                         Icon = new SpriteSpecifier.Texture(new ResourcePath("/Textures/Interface/AdminActions/play.png")),
                         Act = () =>
                         {
-                            _mapManager.SetMapPaused(map.WorldMap, false);
+                            _mapManager.SetMapPaused(map.MapId, false);
                         },
                         Impact = LogImpact.Extreme,
                         Message = Loc.GetString("admin-trick-unpause-map-description"),
@@ -722,7 +722,7 @@ public sealed partial class AdminVerbSystem
                         Icon = new SpriteSpecifier.Texture(new ResourcePath("/Textures/Interface/AdminActions/pause.png")),
                         Act = () =>
                         {
-                            _mapManager.SetMapPaused(map.WorldMap, true);
+                            _mapManager.SetMapPaused(map.MapId, true);
                         },
                         Impact = LogImpact.Extreme,
                         Message = Loc.GetString("admin-trick-pause-map-description"),
diff --git a/Content.Server/Maps/PlanetCommand.cs b/Content.Server/Maps/PlanetCommand.cs
index 558469c4a2..117d1da431 100644
--- a/Content.Server/Maps/PlanetCommand.cs
+++ b/Content.Server/Maps/PlanetCommand.cs
@@ -101,12 +101,7 @@ public sealed class PlanetCommand : IConsoleCommand
     public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         if (args.Length == 1)
-        {
-            var options = _entManager.EntityQuery<MapComponent>(true)
-                .Select(o => new CompletionOption(o.WorldMap.ToString(), "MapId"));
-
-            return CompletionResult.FromOptions(options);
-        }
+            return CompletionResult.FromHintOptions(CompletionHelper.MapIds(_entManager), "Map Id");
 
         if (args.Length == 2)
         {
diff --git a/Content.Server/Weather/WeatherSystem.cs b/Content.Server/Weather/WeatherSystem.cs
index 305cd3b9e0..bacdce2b34 100644
--- a/Content.Server/Weather/WeatherSystem.cs
+++ b/Content.Server/Weather/WeatherSystem.cs
@@ -89,13 +89,8 @@ public sealed class WeatherSystem : SharedWeatherSystem
 
     private CompletionResult WeatherCompletion(IConsoleShell shell, string[] args)
     {
-        var options = new List<CompletionOption>();
-
         if (args.Length == 1)
-        {
-            options.AddRange(EntityQuery<MapComponent>(true).Select(o => new CompletionOption(o.WorldMap.ToString())));
-            return CompletionResult.FromHintOptions(options, "Map Id");
-        }
+            return CompletionResult.FromHintOptions(CompletionHelper.MapIds(EntityManager), "Map Id");
 
         var a = CompletionHelper.PrototypeIDs<WeatherPrototype>(true, ProtoMan);
         return CompletionResult.FromHintOptions(a, Loc.GetString("cmd-weather-hint"));