diff --git a/app/views/admin/reports/_date_range_form.html.haml b/app/views/admin/reports/_date_range_form.html.haml
index 39c43e63d6..fa585fe14f 100644
--- a/app/views/admin/reports/_date_range_form.html.haml
+++ b/app/views/admin/reports/_date_range_form.html.haml
@@ -2,8 +2,8 @@
   = label_tag nil, t(:date_range)
   %br
   = label_tag nil, t(:start), :class => 'inline'
-  = text_field_tag "q[completed_at_gt]", params.dig(:q, :completed_at_gt), :class => 'datetimepicker datepicker-from'
+  = text_field_tag "q[order_completed_at_gt]", params.dig(:q, :order_completed_at_gt), :class => 'datetimepicker datepicker-from'
   %span.range-divider
     %i.icon-arrow-right
-  = text_field_tag "q[completed_at_lt]", params.dig(:q, :completed_at_lt), :class => 'datetimepicker datepicker-to'
+  = text_field_tag "q[order_completed_at_lt]", params.dig(:q, :order_completed_at_lt), :class => 'datetimepicker datepicker-to'
   = label_tag nil, t(:end), :class => 'inline'
diff --git a/app/views/admin/reports/packing.html.haml b/app/views/admin/reports/packing.html.haml
index 3bd3f85604..48fe52194a 100644
--- a/app/views/admin/reports/packing.html.haml
+++ b/app/views/admin/reports/packing.html.haml
@@ -4,7 +4,7 @@
   .row
     .alpha.two.columns= label_tag nil, t(:report_hubs)
     .omega.fourteen.columns
-      = collection_select("q", "distributor_id_in", @distributors, :id, :name, {selected: params.dig(:q, :distributor_id_in)}, {class: "select2 fullwidth", multiple: true})
+      = collection_select("q", "order_distributor_id_in", @distributors, :id, :name, {selected: params.dig(:q, :order_distributor_id_in)}, {class: "select2 fullwidth", multiple: true})
 
   .row
     .alpha.two.columns= label_tag nil, t(:report_producers)
diff --git a/lib/reporting/report_template.rb b/lib/reporting/report_template.rb
index 06beea4226..e8de2cd322 100644
--- a/lib/reporting/report_template.rb
+++ b/lib/reporting/report_template.rb
@@ -35,6 +35,10 @@ module Reporting
       visible_orders_relation.ransack(ransack_params).result
     end
 
+    def ransacked_line_items_relation
+      visible_line_items_relation.ransack(ransack_params).result
+    end
+
     def visible_orders_relation
       ::Permissions::Order.new(current_user).
         visible_orders.complete.not_state(:canceled).
diff --git a/lib/reporting/reports/packing/base.rb b/lib/reporting/reports/packing/base.rb
index a6488be55a..7102d9d553 100644
--- a/lib/reporting/reports/packing/base.rb
+++ b/lib/reporting/reports/packing/base.rb
@@ -12,8 +12,8 @@ module Reporting
 
         def report_query
           Queries::QueryBuilder.new(primary_model, grouping_fields).
-            scoped_to_orders(ransacked_orders_relation).
-            scoped_to_line_items(visible_line_items_relation).
+            scoped_to_orders(visible_orders_relation).
+            scoped_to_line_items(ransacked_line_items_relation).
             with_managed_orders(managed_orders_relation).
             joins_order_and_distributor.
             joins_order_customer.
diff --git a/spec/controllers/api/v0/reports/packing_report_spec.rb b/spec/controllers/api/v0/reports/packing_report_spec.rb
index 30bd855e1a..4becf70c79 100644
--- a/spec/controllers/api/v0/reports/packing_report_spec.rb
+++ b/spec/controllers/api/v0/reports/packing_report_spec.rb
@@ -6,7 +6,7 @@ describe Api::V0::ReportsController, type: :controller do
   let(:params) {
     {
       report_type: 'packing',
-      q: { created_at_lt: Time.zone.now }
+      q: { order_created_at_lt: Time.zone.now }
     }
   }