diff --git a/src/css/mmgisUI.css b/src/css/mmgisUI.css
index 590c5f03..43e48385 100644
--- a/src/css/mmgisUI.css
+++ b/src/css/mmgisUI.css
@@ -1555,6 +1555,7 @@ input::-webkit-inner-spin-button {
     position: fixed !important;
     bottom: 40px !important;
     right: 5px !important;
+    z-index: 1001 !important;
 }
 .mmgisToast {
     z-index: 1000;
diff --git a/src/essence/Tools/Draw/DrawTool_Editing.js b/src/essence/Tools/Draw/DrawTool_Editing.js
index bcd1b4ea..6ef5b7a7 100644
--- a/src/essence/Tools/Draw/DrawTool_Editing.js
+++ b/src/essence/Tools/Draw/DrawTool_Editing.js
@@ -488,7 +488,6 @@ var Editing = {
                         )
                     )
                 }
-                //console.log( JSON.parse(JSON.stringify(DrawTool.contextMenuLayer.feature)) );
 
                 if (
                     reenableEdit &&
@@ -2259,7 +2258,6 @@ var Editing = {
                                 {}
                             DrawTool.contextMenuLayer.snapediting.enable()
                         } catch (e) {
-                            console.log(e)
                             DrawTool.contextMenuLayer.enableEdit()
                         }
                     } else {
@@ -2352,7 +2350,8 @@ var Editing = {
 
             const templaterProperties = templater.getValues(
                 L_.layers.layer[DrawTool.lastContextLayerIndexFileId.layer],
-                properties
+                properties,
+                grouping ? true : false
             )
             if (templaterProperties === false) return
 
diff --git a/src/essence/Tools/Draw/DrawTool_Templater.js b/src/essence/Tools/Draw/DrawTool_Templater.js
index e98db8d2..586c4885 100644
--- a/src/essence/Tools/Draw/DrawTool_Templater.js
+++ b/src/essence/Tools/Draw/DrawTool_Templater.js
@@ -221,7 +221,7 @@ const DrawTool_Templater = {
         })
 
         return {
-            getValues: (layer, existingProperties) => {
+            getValues: (layer, existingProperties, onlyIfChanged) => {
                 const values = {}
                 const invalids = {}
 
@@ -424,7 +424,19 @@ const DrawTool_Templater = {
                         'black'
                     )
                     return false
-                } else return values
+                } else {
+                    if (onlyIfChanged === true) {
+                        const changedValues = {}
+                        Object.keys(values).forEach((k) => {
+                            if (
+                                !existingProperties.hasOwnProperty(k) ||
+                                values[k] !== existingProperties[k]
+                            )
+                                changedValues[k] = values[k]
+                        })
+                        return changedValues
+                    } else return values
+                }
             },
         }
     },
@@ -460,6 +472,7 @@ const DrawTool_Templater = {
         const split = (t._default || t.default).split('#')
         const start = split[0]
         const end = split[1]
+
         for (var i = 0; i < layer.length; i++) {
             if (layer[i] == null) continue
             let geojson =
@@ -476,6 +489,7 @@ const DrawTool_Templater = {
                 }
             }
         }
+
         if ((response.newValue || '').indexOf('#') !== -1) {
             // Actually increment the incrementer for the first time
             let bestVal = 0
@@ -512,6 +526,7 @@ const DrawTool_Templater = {
         if (incRegex.test(response.newValue) == false) {
             response.error = `Incrementing field: '${t.field}' must follow syntax: '${start}{#}${end}'`
         }
+
         return response
     },
     _templateInDesignIdx: 0,