diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index 87e27c28620d..f1e77f3200d8 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -94454,10 +94454,10 @@
     },
     AppDataTableSource: function AppDataTableSource() {
     },
-    AppPaginatedDataTable$(availableRowsPerPage, columns, header, initialFirstRowIndex, onPageChanged, onRowsPerPageChanged, onSelectAll, rowsPerPage, sortAscending, sortColumnIndex, source) {
-      return new A.AppPaginatedDataTable(columns, sortColumnIndex, sortAscending, onSelectAll, initialFirstRowIndex, onPageChanged, rowsPerPage, availableRowsPerPage, onRowsPerPageChanged, source, null);
+    AppPaginatedDataTable$(availableRowsPerPage, columns, header, initialFirstRowIndex, onPageChanged, onRowsPerPageChanged, onSelectAll, rowsPerPage, sortAscending, sortColumnIndex, source, subtractOneFromCount) {
+      return new A.AppPaginatedDataTable(columns, sortColumnIndex, sortAscending, onSelectAll, initialFirstRowIndex, onPageChanged, rowsPerPage, availableRowsPerPage, onRowsPerPageChanged, source, subtractOneFromCount, null);
     },
-    AppPaginatedDataTable: function AppPaginatedDataTable(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10) {
+    AppPaginatedDataTable: function AppPaginatedDataTable(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11) {
       var _ = this;
       _.columns = t0;
       _.sortColumnIndex = t1;
@@ -94469,7 +94469,8 @@
       _.availableRowsPerPage = t7;
       _.onRowsPerPageChanged = t8;
       _.source = t9;
-      _.key = t10;
+      _.subtractOneFromCount = t10;
+      _.key = t11;
     },
     AppPaginatedDataTableState: function AppPaginatedDataTableState(t0, t1, t2) {
       var _ = this;
@@ -214375,7 +214376,7 @@
     },
     pageRowsInfoTitle$4(firstRow, lastRow, rowCount, rowCountIsApproximate) {
       var t1 = "" + lastRow,
-        t2 = A.S(rowCount),
+        t2 = "" + rowCount,
         t3 = "" + firstRow + "\u2013";
       return rowCountIsApproximate ? t3 + t1 + " of about " + t2 : t3 + t1 + " of " + t2;
     },
@@ -436352,13 +436353,17 @@
       }
       t3 = A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 32);
       t4 = _this._firstRowIndex;
-      t4 = A.Text$(t1.pageRowsInfoTitle$4(t4 + 1, t4 + _this._widget.rowsPerPage, _this._rowCount, _this._rowCountApproximate), _null, _null, _null, _null, _null, _null, _null, _null, _null);
-      t5 = A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 32);
+      t5 = _this._widget;
+      t6 = t5.rowsPerPage;
+      t7 = _this._rowCount;
+      t5 = t5.subtractOneFromCount ? 1 : 0;
+      t5 = A.Text$(t1.pageRowsInfoTitle$4(t4 + 1, t4 + t6, t7 - t5, _this._rowCountApproximate), _null, _null, _null, _null, _null, _null, _null, _null, _null);
+      t7 = A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 32);
       t6 = t1.get$previousPageTooltip();
-      t6 = A.IconButton$(B.Alignment_0_0, _null, _null, true, B.Icon_cKo, _null, _this._firstRowIndex <= 0 ? _null : _this.get$_handlePrevious(), B.EdgeInsets_0_0_0_0, _null, t6, _null);
-      t7 = A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 24);
+      t4 = A.IconButton$(B.Alignment_0_0, _null, _null, true, B.Icon_cKo, _null, _this._firstRowIndex <= 0 ? _null : _this.get$_handlePrevious(), B.EdgeInsets_0_0_0_0, _null, t6, _null);
+      t6 = A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 24);
       t1 = t1.get$nextPageTooltip();
-      B.JSArray_methods.addAll$1(footerWidgets, A._setArrayType([t3, t4, t5, t6, t7, A.IconButton$(B.Alignment_0_0, _null, _null, true, B.Icon_wEo, _null, !_this._rowCountApproximate && _this._firstRowIndex + _this._widget.rowsPerPage >= _this._rowCount ? _null : _this.get$_handleNext(), B.EdgeInsets_0_0_0_0, _null, t1, _null), A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 14)], t2));
+      B.JSArray_methods.addAll$1(footerWidgets, A._setArrayType([t3, t5, t7, t4, t6, A.IconButton$(B.Alignment_0_0, _null, _null, true, B.Icon_wEo, _null, !_this._rowCountApproximate && _this._firstRowIndex + _this._widget.rowsPerPage >= _this._rowCount ? _null : _this.get$_handleNext(), B.EdgeInsets_0_0_0_0, _null, t1, _null), A.Container$(_null, _null, B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, 14)], t2));
       return new A.LayoutBuilder(new A.AppPaginatedDataTableState_build_closure0(_this, footerTextStyle, footerWidgets), _null);
     }
   };
@@ -436790,7 +436795,7 @@
         t6 = t4.sortField;
         t6 = J.contains$1$asx(t3._widget.tableColumns, t6) ? J.indexOf$1$asx(t3._widget.tableColumns, t6) : 0;
         t7 = t3._entity_list$_firstRowIndex;
-        t1.push(A.Expanded$(A.SingleChildScrollView$(new A.Padding(B.EdgeInsets_0_16_0_16, A.AppPaginatedDataTable$(A._setArrayType([10, 25, 50, 100], type$.JSArray_legacy_int), t5, _null, t7, new A._EntityListState_build__closure6(t3), new A._EntityListState_build__closure7(_this.store), new A._EntityListState_build__closure8(t3, _this.entityList, rowsPerPage, _this.entityMap, t4), rowsPerPage, t4.sortAscending, t6, t2), _null), _null, B.DragStartBehavior_1, _null, _null, true, _null, false, B.Axis_1), 1));
+        t1.push(A.Expanded$(A.SingleChildScrollView$(new A.Padding(B.EdgeInsets_0_16_0_16, A.AppPaginatedDataTable$(A._setArrayType([10, 25, 50, 100], type$.JSArray_legacy_int), t5, _null, t7, new A._EntityListState_build__closure6(t3), new A._EntityListState_build__closure7(_this.store), new A._EntityListState_build__closure8(t3, _this.entityList, rowsPerPage, _this.entityMap, t4), rowsPerPage, t4.sortAscending, t6, t2, false), _null), _null, B.DragStartBehavior_1, _null, _null, true, _null, false, B.Axis_1), 1));
         return A.Column$(t1, B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1);
       }
     },
@@ -474480,7 +474485,7 @@
       t1 = reportSettings.sortColumn;
       t1 = B.JSArray_methods.contains$1(sortedColumns, t1) ? B.JSArray_methods.indexOf$1(sortedColumns, t1) : _null;
       t2 = reportSettings.sortAscending;
-      t3.push(A.SingleChildScrollView$(A.AppPaginatedDataTable$(B.List_10_20_50_100, reportResult.tableColumns$2(context, new A._ReportDataTableState_build_closure(_this, sortedColumns)), new A.SizedBox(_null, _null, _null, _null), 0, _null, _null, _null, 10, t2, t1, _this.dataTableSource), _null, B.DragStartBehavior_1, B.EdgeInsets_12_12_12_12, _null, _null, _null, false, B.Axis_1));
+      t3.push(A.SingleChildScrollView$(A.AppPaginatedDataTable$(B.List_10_20_50_100, reportResult.tableColumns$2(context, new A._ReportDataTableState_build_closure(_this, sortedColumns)), new A.SizedBox(_null, _null, _null, _null), 0, _null, _null, _null, 10, t2, t1, _this.dataTableSource, true), _null, B.DragStartBehavior_1, B.EdgeInsets_12_12_12_12, _null, _null, _null, false, B.Axis_1));
       return A.Column$(t3, B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1);
     }
   };