diff --git a/lib/customer_service/customer/queries.ex b/lib/customer_service/customer/queries.ex
index 4d434d2..17c7dcc 100644
--- a/lib/customer_service/customer/queries.ex
+++ b/lib/customer_service/customer/queries.ex
@@ -1,10 +1,12 @@
 defmodule CustomerService.Customer.Queries do
+  import Ecto.Query
+
   alias CustomerService.Projections.Customer
   alias CustomerService.Repo
 
   def list_by_org(org_id, params \\ %{}) when is_binary(org_id) do
-    params = Map.put(params, :org_id, org_id)
-    Flop.validate_and_run(Customer, params, for: Customer)
+    base = from(c in Customer, where: c.org_id == ^org_id)
+    Flop.validate_and_run(base, params, for: Customer)
   end
 
   def get_by_org(org_id, customer_id) when is_binary(org_id) and is_binary(customer_id) do
diff --git a/lib/customer_service/lead/queries.ex b/lib/customer_service/lead/queries.ex
index c04b31e..7747802 100644
--- a/lib/customer_service/lead/queries.ex
+++ b/lib/customer_service/lead/queries.ex
@@ -1,10 +1,12 @@
 defmodule CustomerService.Lead.Queries do
+  import Ecto.Query
+
   alias CustomerService.Projections.QuickLead
   alias CustomerService.Repo
 
   def list_by_org(org_id, params \\ %{}) when is_binary(org_id) do
-    params = Map.put(params, :org_id, org_id)
-    Flop.validate_and_run(QuickLead, params, for: QuickLead)
+    base = from(q in QuickLead, where: q.org_id == ^org_id)
+    Flop.validate_and_run(base, params, for: QuickLead)
   end
 
   def get_by_org(org_id, lead_id) when is_binary(org_id) and is_binary(lead_id) do