diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py
index 9f2a8ad83..f5ddcfc4e 100644
--- a/wcs/backoffice/management.py
+++ b/wcs/backoffice/management.py
@@ -82,7 +82,6 @@ from ..qommon.storage import (
     NotEqual,
     NotNull,
     Null,
-    Or,
     StrictNotEqual,
 )
 from ..qommon.substitution import CompatibilityNamesDict
@@ -2660,7 +2659,7 @@ class FormPage(Directory):
                 except KeyError:
                     applied_filters = None
             if applied_filters:
-                criterias.append(Or([Equal('status', x) for x in applied_filters]))
+                criterias.append(Contains('status', applied_filters))
                 criterias[-1]._label = criteria_label
                 displayed_criterias = criterias
 
diff --git a/wcs/statistics/views.py b/wcs/statistics/views.py
index 29eaef8a7..ad7e90554 100644
--- a/wcs/statistics/views.py
+++ b/wcs/statistics/views.py
@@ -29,7 +29,7 @@ from wcs.categories import Category
 from wcs.formdef import FormDef
 from wcs.qommon import _, misc
 from wcs.qommon.misc import C_
-from wcs.qommon.storage import Equal, Or, StrictNotEqual
+from wcs.qommon.storage import Contains, Equal, StrictNotEqual
 
 
 class RestrictedView(View):
@@ -270,7 +270,7 @@ class FormsCountView(RestrictedView):
                     pass
 
         if applied_filters:
-            criterias.append(Or([Equal('status', x) for x in applied_filters]))
+            criterias.append(Contains('status', applied_filters))
         else:
             criterias = [StrictNotEqual('status', 'draft')] + criterias
 
diff --git a/wcs/variables.py b/wcs/variables.py
index 75360857c..4877fc204 100644
--- a/wcs/variables.py
+++ b/wcs/variables.py
@@ -26,7 +26,7 @@ from .formdata import get_workflow_roles_substitution_variables
 from .formdef import FormDef, FormDefDoesNotExist
 from .qommon import _, force_str, misc
 from .qommon.evalutils import make_datetime
-from .qommon.storage import And, Equal, Intersects, Not, NotEqual, NotNull, Null, Or, StrictNotEqual
+from .qommon.storage import And, Contains, Equal, Intersects, Not, NotEqual, NotNull, Null, Or, StrictNotEqual
 from .qommon.substitution import CompatibilityNamesDict
 from .qommon.templatetags.qommon import parse_datetime
 
@@ -87,7 +87,7 @@ class LazyFormDefObjectsManager:
 
     def pending(self):
         status_filters = ['wf-%s' % x.id for x in self._formdef.workflow.get_not_endpoint_status()]
-        criterias = [Or([Equal('status', x) for x in status_filters])]
+        criterias = [Contains('status', status_filters)]
         return self._clone(self._criterias + criterias)
 
     def current_user(self):  # filter on current user
@@ -143,7 +143,7 @@ class LazyFormDefObjectsManager:
 
     def done(self):
         status_filters = ['wf-%s' % x.id for x in self._formdef.workflow.get_endpoint_status()]
-        criterias = [Or([Equal('status', x) for x in status_filters])]
+        criterias = [Contains('status', status_filters)]
         return self._clone(self._criterias + criterias)
 
     def set_geo_center(self, lazy_formdata):