diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
index aa829582f..ff22b9f4c 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
@@ -338,7 +338,7 @@ public interface DistributionSetManagement
     /**
      * Toggles {@link DistributionSetTag} assignment to given
      * {@link DistributionSet}s by means that if some (or all) of the targets in
-     * the list have the {@link Tag} not yet assigned, they will be. If all of
+     * the list have the {@link Tag} not yet assigned, they will be. Only if all of
      * theme have the tag already assigned they will be removed instead.
      *
      * @param setIds
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
index 602c7aa72..58be29bca 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
@@ -554,7 +554,7 @@ public interface TargetManagement {
     /**
      * Toggles {@link TargetTag} assignment to given {@link Target}s by means
      * that if some (or all) of the targets in the list have the {@link Tag} not
-     * yet assigned, they will be. If all of theme have the tag already assigned
+     * yet assigned, they will be. Only if all of theme have the tag already assigned
      * they will be removed instead.
      *
      * @param controllerIds
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 b4b9645f1..ea3837fae 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
@@ -536,7 +536,7 @@ public class TargetTable extends AbstractTable<Target> {
     /**
      * Toggles {@link TargetTag} assignment to given target ids by means that if
      * some (or all) of the targets in the list have the {@link Tag} not yet
-     * assigned, they will be. If all of theme have the tag already assigned
+     * assigned, they will be. Only if all of them have the tag already assigned
      * they will be removed instead. Additionally a success popup is shown.
      *
      * @param targetIds