diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index 1f416a41872f9c122fb81e822676bd5f6e99c113..2f3b4badfe93f02c14c1794a507a59394ffd7bbb 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -258,11 +258,15 @@ public class Bookmark extends Element implements ListItem {
 				}
 			}
 			return true;
-		} else {
+		} else if (parts.length > 0) {
 			final Jid jid = getJid();
 			return (jid != null && jid.toString().contains(parts[0])) ||
 				getDisplayName().toLowerCase(Locale.US).contains(parts[0]) ||
 				matchInTag(context, parts[0]);
+		} else {
+			final Jid jid = getJid();
+			return (jid != null && jid.toString().contains(needle)) ||
+				getDisplayName().toLowerCase(Locale.US).contains(needle);
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 1fb2799b7453f29421945b5e544c8e3517964108..06e43cef4b373947d6f85dfc430383899c10db0f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -231,10 +231,13 @@ public class Contact implements ListItem, Blockable {
                 }
             }
             return true;
-        } else {
+        } else if(parts.length > 0) {
             return jid.toString().contains(parts[0]) ||
                     getDisplayName().toLowerCase(Locale.US).contains(parts[0]) ||
                     matchInTag(context, parts[0]);
+        } else {
+            return jid.toString().contains(needle) ||
+                    getDisplayName().toLowerCase(Locale.US).contains(needle);
         }
     }