diff --git a/edbob/pyramid/views/crud.py b/edbob/pyramid/views/crud.py
index c2e4a3e..0c9abfc 100644
--- a/edbob/pyramid/views/crud.py
+++ b/edbob/pyramid/views/crud.py
@@ -92,8 +92,7 @@ class Crud(object):
            You more than likely will want to override this.
         """
 
-        fs = self.make_fieldset(obj)
-        return fs
+        return self.make_fieldset(obj)
 
     def post_sync(self, fs):
         pass
diff --git a/edbob/pyramid/views/grid.py b/edbob/pyramid/views/grid.py
index e0f0155..5600882 100644
--- a/edbob/pyramid/views/grid.py
+++ b/edbob/pyramid/views/grid.py
@@ -89,11 +89,15 @@ class Grid(object):
     def grid_config(self, search, fmap):
         return self.make_grid_config(search, fmap)
 
+    def filter_query(self, q):
+        return q
+
     def make_query(self, config, jmap=None):
         if jmap is None:
             jmap = self.join_map()
         smap = self.sort_map()
         q = Session.query(self.mapped_class)
+        q = self.filter_query(q)
         q = filters.filter_query(q, config, jmap)
         q = grids.sort_query(q, config, smap, jmap)
         return q