diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
index e98439b57..54ff37e87 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
@@ -245,8 +245,9 @@ public class RolloutGroupManagement {
                 JoinType.LEFT);
 
         final Root<RolloutTargetGroup> countQueryFrom = countQuery.distinct(true).from(RolloutTargetGroup.class);
-        countQuery
-                .select(cb.count(countQueryFrom.join(RolloutTargetGroup_.target).join(Target_.actions, JoinType.LEFT)))
+        countQueryFrom.join(RolloutTargetGroup_.target);
+        countQueryFrom.join(RolloutTargetGroup_.actions, JoinType.LEFT);
+        countQuery.select(cb.count(countQueryFrom))
                 .where(cb.equal(countQueryFrom.get(RolloutTargetGroup_.rolloutGroup), rolloutGroup));
         final Long totalCount = entityManager.createQuery(countQuery).getSingleResult();
 
diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
index 0d3bc62c6..1573048ec 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
@@ -552,7 +552,7 @@ public class RolloutManagement {
         if (updated == 0) {
             // nothing to check, maybe another instance already checked in
             // between
-            LOGGER.info("No rolloutcheck necessary for current scheduled check {}, next check at {}", lastCheck,
+            LOGGER.debug("No rolloutcheck necessary for current scheduled check {}, next check at {}", lastCheck,
                     lastCheck + delayBetweenChecks);
             return;
         }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java
index 1c8382223..febb0c5b4 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java
@@ -29,6 +29,7 @@ import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.spring.annotation.SpringComponent;
 import com.vaadin.spring.annotation.ViewScope;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.UI;
 
 /**
  * @author Venugopal Boodidadinne(RBEI/BSJ)
@@ -71,11 +72,11 @@ public class TargetFilterCountMessageLabel extends Label {
 
     @EventBusListenerMethod(scope = EventScope.SESSION)
     void onEvent(final CustomFilterUIEvent custFUIEvent) {
-        if (custFUIEvent == CustomFilterUIEvent.FILTER_TARGET_BY_QUERY
-                || custFUIEvent == CustomFilterUIEvent.TARGET_DETAILS_VIEW
+        if (custFUIEvent == CustomFilterUIEvent.TARGET_DETAILS_VIEW
                 || custFUIEvent == CustomFilterUIEvent.CREATE_NEW_FILTER_CLICK
-                || custFUIEvent == CustomFilterUIEvent.EXIT_CREATE_OR_UPDATE_FILTRER_VIEW) {
-            displayTargetFilterMessage();
+                || custFUIEvent == CustomFilterUIEvent.EXIT_CREATE_OR_UPDATE_FILTRER_VIEW
+                || custFUIEvent == CustomFilterUIEvent.FILTER_TARGET_BY_QUERY) {
+            UI.getCurrent().access(() -> displayTargetFilterMessage());
         }
     }
 
@@ -89,8 +90,8 @@ public class TargetFilterCountMessageLabel extends Label {
         long totalTargets = 0;
         if (filterManagementUIState.isCreateFilterViewDisplayed() || filterManagementUIState.isEditViewDisplayed()) {
             if (null != filterManagementUIState.getFilterQueryValue()) {
-                totalTargets = targetManagement.countTargetByTargetFilterQuery(filterManagementUIState
-                        .getFilterQueryValue());
+                totalTargets = targetManagement
+                        .countTargetByTargetFilterQuery(filterManagementUIState.getFilterQueryValue());
             }
             final StringBuilder targetMessage = new StringBuilder(i18n.get("label.target.filtered.total"));
             if (filterManagementUIState.getTargetsTruncated() != null) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
index 256a04926..dfdbcd9de 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
@@ -344,21 +344,22 @@ public class DistributionAddUpdateWindowLayout extends VerticalLayout {
 
     private boolean duplicateCheck(final String name, final String version) {
         final DistributionSet existingDs = distributionSetManagement.findDistributionSetByNameAndVersion(name, version);
+        /*
+         * Distribution should not exists with the same name & version. Display
+         * error message, when the "existingDs" is not null and it is add window
+         * (or) when the "existingDs" is not null and it is edit window and the
+         * distribution Id of the edit window is different then the "existingDs"
+         */
+        if (existingDs != null && !existingDs.getId().equals(editDistId)) {
+            distNameTextField.addStyleName("v-textfield-error");
+            distVersionTextField.addStyleName("v-textfield-error");
+            notificationMessage.displayValidationError(
+                    i18n.get("message.duplicate.dist", new Object[] { existingDs.getName(), existingDs.getVersion() }));
 
-        if (existingDs == null) {
+            return false;
+        } else {
             return true;
         }
-
-        if (editDistribution && !existingDs.getId().equals(editDistId)) {
-            return true;
-        }
-
-        distNameTextField.addStyleName("v-textfield-error");
-        distVersionTextField.addStyleName("v-textfield-error");
-        notificationMessage.displayValidationError(
-                i18n.get("message.duplicate.dist", new Object[] { existingDs.getName(), existingDs.getVersion() }));
-
-        return false;
     }
 
     /**