diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
index bd9291473..940e3b27a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
@@ -79,7 +79,7 @@ public class SoftwareModuleTable extends AbstractTable {
     @Autowired
     private UploadViewAcceptCriteria uploadViewAcceptCriteria;
     
-    private Boolean isFilterEvent = false;
+    private Boolean isFilterApplied = false;
 
     /**
      * Initialize the filter layout.
@@ -107,19 +107,18 @@ public class SoftwareModuleTable extends AbstractTable {
             if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT
                     || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE
                     || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) {
-                
-                if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){
+                final Map<String, Object> queryConfig = prepareQueryConfigFilters();
+                if(queryConfig.size()<1 && isFilterApplied==false){
                     UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
                                                            
                 }else {
                      refreshFilter();
-                    if(prepareQueryConfigFilters().size()<1){
-                        isFilterEvent = false;
+                    if(queryConfig.size()<1){
+                        isFilterApplied = false;
                     }else{
-                        isFilterEvent = true;
+                        isFilterApplied = true;
                     }
                 }
-               //refreshFilter();
             }
         });
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index 575f0a367..f62504911 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -115,7 +115,7 @@ public class DistributionSetTable extends AbstractTable {
     @Autowired
     private transient TargetManagement targetManagement;
     
-    private Boolean isFilterEvent = false;
+    private Boolean isFilterApplied = false;
 
     /**
      * Initialize the component.
@@ -616,19 +616,18 @@ public class DistributionSetTable extends AbstractTable {
         if (event == DistributionTableFilterEvent.FILTER_BY_TEXT
                 || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT
                 || event == DistributionTableFilterEvent.FILTER_BY_TAG) {
-            if(prepareQueryConfigFilters().size()<1 && isFilterEvent==false){
+            final Map<String, Object> queryConfig = prepareQueryConfigFilters();
+            if(queryConfig.size()<1 && isFilterApplied==false){
                 UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
                                                        
             }else {
                 UI.getCurrent().access(() -> refreshFilter());
-                if(prepareQueryConfigFilters().size()<1){
-                    isFilterEvent = false;
+                if(queryConfig.size()<1){
+                    isFilterApplied = false;
                 }else{
-                    isFilterEvent = true;
+                    isFilterApplied = true;
                 }
             } 
-            
-         //   UI.getCurrent().access(() -> refreshFilter());
         }
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
index 6d5b7dcd5..dd8216dfd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
@@ -95,7 +95,7 @@ public class SwModuleTable extends AbstractTable {
     @Autowired
     private ArtifactDetailsLayout artifactDetailsLayout;
     
-    private Boolean isFilterEvent = false;
+    private Boolean isFilterApplied = false;
 
     /**
      * Initialize the filter layout.
@@ -126,23 +126,21 @@ public class SwModuleTable extends AbstractTable {
             if (filterEvent == SMFilterEvent.FILTER_BY_TYPE || filterEvent == SMFilterEvent.FILTER_BY_TEXT
                     || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TYPE
                     || filterEvent == SMFilterEvent.REMOVER_FILTER_BY_TEXT) {
-                if(prepareQueryConfigFilters().size()<2 && isFilterEvent==false){
+                final Map<String, Object> queryConfig = prepareQueryConfigFilters();
+                if(queryConfig.size()<2 && isFilterApplied==false){
                     UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
                                                            
                 }else {
                     UI.getCurrent().access(() ->{ refreshFilter();
-                             styleTableOnDistSelection();
+                         styleTableOnDistSelection();
                      });
-                    if(prepareQueryConfigFilters().size()<2){
-                        isFilterEvent = false;
+                    if(queryConfig.size()<2){
+                        isFilterApplied = false;
                     }else{
-                        isFilterEvent = true;
+                        isFilterApplied = true;
                     }
                 } 
-                         
-               /* refreshFilter();
-                styleTableOnDistSelection();*/
-          }
+           }
         });
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
index e8f9e57ac..ab1ccdeac 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
@@ -113,7 +113,7 @@ public class DistributionTable extends AbstractTable {
 
     private Button distributinPinnedBtn;
     
-    private Boolean isFilterEvent = false;
+    private Boolean isFilterApplied = false;
 
     /**
      * Initialize the distribution table.
@@ -142,24 +142,23 @@ public class DistributionTable extends AbstractTable {
         if (event == DistributionTableFilterEvent.FILTER_BY_TEXT
                 || event == DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT
                 || event == DistributionTableFilterEvent.FILTER_BY_TAG) {
-            if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
-                    && ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty()
-                    && prepareQueryConfigFilters().size()<3
-                    && isFilterEvent==false){
+            final Map<String, Object> queryConfig = prepareQueryConfigFilters();
+            if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
+                    && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty()
+                    && queryConfig.size()<3
+                    && isFilterApplied==false){
                 UI.getCurrent().access(() -> ((LazyQueryContainer) getContainerDataSource()).refresh());
                                                        
             }else {
                 UI.getCurrent().access(() -> refreshFilter());
-                if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
-                        && ((List)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty()
-                        && prepareQueryConfigFilters().size()<3){
-                    isFilterEvent = false;
+                if(((boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
+                        && ((List)queryConfig.get(SPUIDefinitions.FILTER_BY_TAG)).isEmpty()
+                        && queryConfig.size()<3){
+                    isFilterApplied = false;
                 }else{
-                    isFilterEvent = true;
+                    isFilterApplied = true;
                 }
             } 
-            
-           // UI.getCurrent().access(() -> refreshFilter());
         }
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
index 186207c50..17256cca8 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
@@ -140,7 +140,7 @@ public class TargetTable extends AbstractTable implements Handler {
     private ShortcutAction actionSelectAll;
     private ShortcutAction actionUnSelectAll;
     
-    private Boolean isFilterEvent = Boolean.FALSE;;
+    private Boolean isFilterApplied = Boolean.FALSE;;
    
 
     @Override
@@ -211,17 +211,18 @@ public class TargetTable extends AbstractTable implements Handler {
     void onEvent(final TargetFilterEvent filterEvent) {
         UI.getCurrent().access(() -> {
             if (checkFilterEvent(filterEvent)) {
-               if(((boolean)prepareQueryConfigFilters().get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
-                        && prepareQueryConfigFilters().size()<2
-                        && isFilterEvent==Boolean.FALSE){
+                final Map<String, Object> queryConfiguration = prepareQueryConfigFilters();
+               if(((boolean)queryConfiguration.get(SPUIDefinitions.FILTER_BY_NO_TAG)==false)
+                        && queryConfiguration.size()<2
+                        && isFilterApplied==Boolean.FALSE){
                    ((LazyQueryContainer) getContainerDataSource()).refresh();
-                                           
+                                                             
                 }else {
                     refreshFilter();
-                    if(prepareQueryConfigFilters().size()<2){
-                        isFilterEvent = Boolean.FALSE;
+                    if(queryConfiguration.size()<2){
+                        isFilterApplied = Boolean.FALSE;
                     }else{
-                        isFilterEvent = Boolean.TRUE;
+                        isFilterApplied = Boolean.TRUE;
                     }
                 }