diff --git a/tabellio/searchform/simple.py b/tabellio/searchform/simple.py
index 65e3ce1..540a618 100644
--- a/tabellio/searchform/simple.py
+++ b/tabellio/searchform/simple.py
@@ -124,14 +124,15 @@ class SimpleSearchView(BrowserView):
         try:
             int(search_query)
         except ValueError:
-            kwargs = {'SearchableText': search_query}
-        else:
-            kwargs = {'nodoc': search_query}
-        c = catalog(
+            c = catalog(
                 portal_type=['tabellio.documents.dossier',
                              'tabellio.documents.document',
                              'tabellio.documents.question'],
-                **kwargs)
+                SearchableText=search_query)
+        else:
+            c = catalog(
+                portal_type=['tabellio.documents.document'],
+                nodos=search_query)
         if sorton == 'session':
             cmpf = cmpfunctions.Cmp().cmp_session
         elif sorton == 'type':