diff --git a/parser_api/controller.py b/parser_api/controller.py
index 885be51..3c375b0 100644
--- a/parser_api/controller.py
+++ b/parser_api/controller.py
@@ -40,7 +40,7 @@ def contains_lower(name, val):
         return getattr(models.Record, name) == val
 
 
-def and_if_can(a: BinaryExpression, b: Optional[BinaryExpression]):
+def and_if_can(a: BinaryExpression, b: Optional[BinaryExpression]) -> BinaryExpression:
     if b is not None:
         return a & b
     else:
@@ -63,8 +63,8 @@ def search_each(db: Session, filters: schemas.RecordRequest) -> List[schemas.Rec
 
     if query is None:
         res = db.query(models.Record).all()
-
-    res = db.query(models.Record).filter(query).all()
+    else:
+        res = db.query(models.Record).filter(query).all()
 
     return res