diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
index f71967800f..6bf8fc9ce2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
@@ -417,25 +417,25 @@ export default abstract class LeafletMap {
         };
     }
 
-  convertToPolygonFormat(points: Array<any>): Array<any> {
-    if (points.length) {
-      return points.map(point => {
-        if (point.length) {
-          return this.convertToPolygonFormat(point);
-        } else {
-          return [point.lat, point.lng];
-        }
-      });
-    } else {
-      return [];
+    convertToPolygonFormat(points: Array<any>): Array<any> {
+      if (points.length) {
+        return points.map(point => {
+          if (point.length) {
+            return this.convertToPolygonFormat(point);
+          } else {
+            return [point.lat, point.lng];
+          }
+        });
+      } else {
+        return [];
+      }
     }
-  }
 
-  convertPolygonToCustomFormat(expression: any[][]): object {
-    return {
-      [this.options.polygonKeyName] : this.convertToPolygonFormat(expression)
-    };
-  }
+    convertPolygonToCustomFormat(expression: any[][]): object {
+      return {
+        [this.options.polygonKeyName] : this.convertToPolygonFormat(expression)
+      };
+    }
 
     updateData(drawRoutes: boolean, showPolygon: boolean) {
       this.drawRoutes = drawRoutes;
@@ -592,11 +592,10 @@ export default abstract class LeafletMap {
     }
 
     deletePolygon(key: string) {
-      let polygon = this.polygons.get(key)?.leafletPoly;
+      const polygon = this.polygons.get(key)?.leafletPoly;
       if (polygon) {
         this.map.removeLayer(polygon);
         this.polygons.delete(key);
-        polygon = null;
       }
       return polygon;
     }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
index 409debda88..dc2361a5fc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
@@ -55,7 +55,7 @@ export class Polygon {
             this.leafletPoly.on('click', (event: LeafletMouseEvent) => {
                 for (const action in this.settings.polygonClick) {
                     if (typeof (this.settings.polygonClick[action]) === 'function') {
-                        this.settings.polygonClick[action](event.originalEvent, polyData.datasource);
+                        this.settings.polygonClick[action](event.originalEvent, polyData.$datasource);
                     }
                 }
             });