diff --git a/app/controllers/admin/subscriptions_controller.rb b/app/controllers/admin/subscriptions_controller.rb
index a3b1e3176b..22c7d9a161 100644
--- a/app/controllers/admin/subscriptions_controller.rb
+++ b/app/controllers/admin/subscriptions_controller.rb
@@ -16,7 +16,7 @@ module Admin
       respond_to do |format|
         format.html do
           if view_context.subscriptions_setup_complete?(@shops)
-            @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user)
+            @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user).includes([:distributors, :cached_incoming_exchanges])
             @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).includes(:taggings)
             @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user)
           else
@@ -172,7 +172,7 @@ module Admin
         includes(:taggings).
         where(taggings: { taggable_type: "Spree::PaymentMethod",
                           taggable_id: Spree::PaymentMethod.from(Enterprise.managed_by(spree_current_user).
-                          select('enterprises.id').find_by_id(params[:enterprise_id])),
+                          select('enterprises.id').find_by(id: params[:enterprise_id])),
                           context: 'tags' })
 
       payment_method_tags.each_with_object({}) do |tag, hash|
diff --git a/package.json b/package.json
index a0fcde890d..202bd5052c 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,12 @@
     "storybook": "start-storybook"
   },
   "jest": {
-    "testRegex": ["spec/javascripts/.*_test\\.js"],
-    "transformIgnorePatterns": ["/node_modules/(?!(stimulus)/)"]
+    "testRegex": [
+      "spec/javascripts/.*_test\\.js"
+    ],
+    "transformIgnorePatterns": [
+      "/node_modules/(?!(stimulus)/)"
+    ]
   },
   "devDependencies": {
     "@storybook/addon-controls": "^6.4.13",