diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java
index a7f1088908b..7a67dfc9510 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java
@@ -24,26 +24,32 @@ public class TagTagFilter extends AbstractTextFilter<TagDTO> implements FilterWi
                 if(tag.getTag().contains(value)) {
                     return true;       
                 }
+                break;
             case Equals:
                 if(tag.getTag().equals(value)) {
                     return true;       
                 }
+                break;
             case NotContains:
                 if(!tag.getTag().contains(value)) {
                     return true;       
                 }
+                break;
             case NotEqualTo:
                 if(!tag.getTag().equals(value)) {
                     return true;       
                 }
+                break;
             case EndsWith:
                 if(tag.getTag().endsWith(value)) {
                     return true;       
                 }
+                break;
             case StartsWith:
                 if(tag.getTag().startsWith(value)) {
                     return true;       
                 }
+                break;
             default:    
                 throw new RuntimeException("Operator " + operator.getOperator().name() + " is not supported."); 
             }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java
index 1dc24999eba..9b561ffeff5 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java
@@ -23,26 +23,32 @@ public class TagUsernameFilter extends AbstractTextFilter<TagDTO> implements Fil
                 if(tag.getUsername().contains(value)) {
                     return true;       
                 }
+                break;
             case Equals:
                 if(tag.getUsername().equals(value)) {
                     return true;       
                 }
+                break;
             case NotContains:
                 if(!tag.getUsername().contains(value)) {
                     return true;       
                 }
+                break;
             case NotEqualTo:
                 if(!tag.getUsername().equals(value)) {
                     return true;       
                 }
+                break;
             case EndsWith:
                 if(tag.getUsername().endsWith(value)) {
                     return true;       
                 }
+                break;
             case StartsWith:
                 if(tag.getUsername().startsWith(value)) {
                     return true;       
                 }
+                break;
             default:    
                 throw new RuntimeException("Operator " + operator.getOperator().name() + " is not supported."); 
             }