diff --git a/src/classes/stageClasses/drawings/helper/DrawingHelper.lua b/src/classes/stageClasses/drawings/helper/DrawingHelper.lua
index 8432890..76018c5 100644
--- a/src/classes/stageClasses/drawings/helper/DrawingHelper.lua
+++ b/src/classes/stageClasses/drawings/helper/DrawingHelper.lua
@@ -1,4 +1,5 @@
 local Util = require("classes.util.Util")
+local DcsUtil = require("classes.util.DcsUtil")
 local Logger = require("classes.util.Logger")
 local GlobalConfig = require("classes.configuration.GlobalConfig")
 
@@ -14,9 +15,6 @@ local drawingLogger = Logger.new("DrawingHelper", level)
 local DrawingHelper = {}
 DrawingHelper.__index = DrawingHelper
 
-
-local customDrawingIdIncrementer = 4210
-
 ---@param object DrawingObject
 ---@param logger Logger?
 ---@return integer? id
@@ -50,8 +48,7 @@ function DrawingHelper.Draw(object, logger)
 end
 
 function DrawingHelper.GetAndAddId()
-    customDrawingIdIncrementer = customDrawingIdIncrementer + 1
-    return customDrawingIdIncrementer
+    return DcsUtil.GetNextDrawID()
 end
 
 ---@private
diff --git a/src/classes/stageClasses/missions/BuildableMission.lua b/src/classes/stageClasses/missions/BuildableMission.lua
index a4fa74e..cc0b5b7 100644
--- a/src/classes/stageClasses/missions/BuildableMission.lua
+++ b/src/classes/stageClasses/missions/BuildableMission.lua
@@ -77,7 +77,7 @@ function BuildableMission.new(database, logger, targetZone, noLandingZone, requi
     self.code = tostring(database:GetNewMissionCode())
     
     local splitTargetZoneName = Util.split_string(targetZone.name, "_")
-    if splitTargetZoneName and #splitTargetZoneName[3] then
+    if splitTargetZoneName and splitTargetZoneName[3] and splitTargetZoneName[3] ~= "" then
         self.name = splitTargetZoneName[3]
     else
         self.name = "Resupply"
diff --git a/src/classes/util/DcsUtil.lua b/src/classes/util/DcsUtil.lua
index 1fbdacd..0bdc209 100644
--- a/src/classes/util/DcsUtil.lua
+++ b/src/classes/util/DcsUtil.lua
@@ -632,13 +632,19 @@ do     -- INIT DCS_UTIL
     ---@field b number
     ---@field a number
 
+    
+    local customDrawingIdIncrementer = 4210
+    function DCS_UTIL.GetNextDrawID()
+        customDrawingIdIncrementer = customDrawingIdIncrementer + 1
+        return customDrawingIdIncrementer
+    end
 
     ---@param groupID number
     ---@param text string
     ---@param location Vec3
     ---@return number markID
     function DCS_UTIL.AddMarkToGroup(groupID, text, location)
-        drawID = drawID + 1
+        local drawID = DCS_UTIL.GetNextDrawID()
         trigger.action.markToGroup(drawID, text, location, groupID, true, nil)
         return drawID
     end
@@ -648,7 +654,7 @@ do     -- INIT DCS_UTIL
     ---@param location Vec3
     ---@return integer
     function DCS_UTIL.AddMarkToAll(text, location)
-        drawID = drawID + 1
+        local drawID = DCS_UTIL.GetNextDrawID()
         trigger.action.markToAll(drawID, text, location, true, nil)
         return drawID
     end