diff --git a/PyRIGS/views.py b/PyRIGS/views.py
index 713d478b..710e1ecf 100644
--- a/PyRIGS/views.py
+++ b/PyRIGS/views.py
@@ -101,11 +101,13 @@ class SecureAPIRequest(generic.View):
                 for field in fields:
                     q = Q(**{field + "__icontains": part})
                     qs.append(q)
-                for filter in filters:
-                    q = Q(**{field: True})
-                    qs.append(q)
+
                 queries.append(reduce(operator.or_, qs))
 
+            for f in filters:
+                q = Q(**{f: True})
+                queries.append(q)
+
             # Build the data response list
             results = []
             query = reduce(operator.and_, queries)