diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
index 8bb34e69be..29b0d4c4db 100644
--- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
+++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
@@ -22,8 +22,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.refreshData = ->
     unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
-      $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].first_order).format('YYYY-MM-DD')
-      $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].last_order).startOf('day').format('YYYY-MM-DD')
+      $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
+      $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
 
     RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
     RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
diff --git a/app/serializers/api/admin/basic_order_cycle_serializer.rb b/app/serializers/api/admin/basic_order_cycle_serializer.rb
index 3b3e29f83d..312e2aa95f 100644
--- a/app/serializers/api/admin/basic_order_cycle_serializer.rb
+++ b/app/serializers/api/admin/basic_order_cycle_serializer.rb
@@ -1,7 +1,7 @@
 class Api::Admin::BasicOrderCycleSerializer < ActiveModel::Serializer
   include OrderCyclesHelper
 
-  attributes :id, :name, :status, :first_order, :last_order
+  attributes :id, :name, :status, :orders_open_at, :orders_close_at
 
   has_many :suppliers, serializer: Api::Admin::IdNameSerializer
   has_many :distributors, serializer: Api::Admin::IdNameSerializer
@@ -10,15 +10,11 @@ class Api::Admin::BasicOrderCycleSerializer < ActiveModel::Serializer
     order_cycle_status_class object
   end
 
-  def first_order
+  def orders_open_at
     object.orders_open_at.andand.strftime("%F")
   end
 
-  def last_order
-    if object.orders_close_at.present?
-      (object.orders_close_at + 1.day).strftime("%F")
-    else
-      nil
-    end
+  def orders_close_at
+    object.orders_close_at.andand.strftime("%F")
   end
 end