diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java
index a3076b6f0..adec49389 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java
@@ -92,9 +92,12 @@ public class RsqlParserValidationOracle implements RsqlValidationOracle {
     }
 
     private static Collection<? extends SuggestToken> getLogicalOperatorSuggestion(final String rsqlQuery) {
-        final int currentQueryLength = rsqlQuery.length();
-        // only return and/or suggestion when there is a space at the end
+        if (!rsqlQuery.endsWith(" ")) {
+            return Collections.emptyList();
+        }
         if (rsqlQuery.endsWith(" ")) {
+            final int currentQueryLength = rsqlQuery.length();
+            // only return and/or suggestion when there is a space at the end
             final Collection<String> tokenImages = TokenDescription.getTokenImage(TokenDescription.LOGICAL_OP);
             final List<SuggestToken> logicalOps = new ArrayList<>(tokenImages.size());
             for (final String tokenImage : tokenImages) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
index b9e98c9f0..f508aa436 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
@@ -379,10 +379,14 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
     }
 
     private void onSearchIconClick() {
-        if (!queryTextField.isValidationError()) {
-            queryTextField.showValidationInProgress();
-            queryTextField.getExecutor().execute(queryTextField.new StatusCircledAsync(UI.getCurrent()));
+
+        if (queryTextField.isValidationError()) {
+            return;
         }
+
+        queryTextField.showValidationInProgress();
+        queryTextField.getExecutor().execute(queryTextField.new StatusCircledAsync(UI.getCurrent()));
+
     }
 
     @Override
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java
index 8b5812bf1..80f7714b7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java
@@ -54,14 +54,16 @@ public class AutoCompleteTextFieldConnector extends AbstractExtensionConnector {
             @Override
             public void showSuggestions(final SuggestionContextDto suggestContext) {
                 select.clearItems();
-                if (suggestContext != null) {
-                    final List<SuggestTokenDto> suggestions = suggestContext.getSuggestions();
-                    if (suggestions != null && !suggestions.isEmpty()) {
-                        select.addItems(suggestions, textFieldWidget, panel, rpc);
-                        panel.showRelativeTo(textFieldWidget);
-                        select.moveSelectionDown();
-                        return;
-                    }
+                if (suggestContext == null) {
+                    panel.hide();
+                    return;
+                }
+                final List<SuggestTokenDto> suggestions = suggestContext.getSuggestions();
+                if (suggestions != null && !suggestions.isEmpty()) {
+                    select.addItems(suggestions, textFieldWidget, panel, rpc);
+                    panel.showRelativeTo(textFieldWidget);
+                    select.moveSelectionDown();
+                    return;
                 }
                 panel.hide();
             }