diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entities-hierarchy-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entities-hierarchy-widget.component.ts
index 3b6d7146ed..ebf9baf21e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entities-hierarchy-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entities-hierarchy-widget.component.ts
@@ -418,6 +418,7 @@ export class EntitiesHierarchyWidgetComponent extends PageComponent implements O
     const childrenDatasource = {
       dataKeys: datasource.dataKeys,
       type: DatasourceType.entity,
+      filterId: datasource.filterId,
       entityFilter
     } as HierarchyNodeDatasource;
     const subscriptionOptions: WidgetSubscriptionOptions = {
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 7ee3ff86f7..c67801d85b 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
@@ -219,8 +219,12 @@ export default abstract class LeafletMap {
                 }
             } else {
                 this.map.once('zoomend', () => {
-                    if (!this.options.defaultZoomLevel && this.map.getZoom() > this.options.minZoomLevel) {
-                        this.map.setZoom(this.options.minZoomLevel, { animate: false });
+                    let minZoom = this.options.minZoomLevel;
+                    if (this.options.defaultZoomLevel) {
+                      minZoom = Math.min(minZoom, this.options.defaultZoomLevel);
+                    }
+                    if (this.map.getZoom() > minZoom) {
+                        this.map.setZoom(minZoom, { animate: false });
                     }
                 });
                 if (this.options.useDefaultCenterPosition) {