diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 748f8342f..17b9a56f0 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -448,7 +448,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
     //return 'isAuthenticated: ${authState.isAuthenticated}';
     //return 'MultiSelect: ${productListState.isInMultiselect()} SelectedIds: ${productListState.selectedIds}';
     //return 'History: $historyList';
-    return 'Report State: ${uiState.reportsUIState}, Settings: ${userCompany.settings}';
+    //return 'Report State: ${uiState.reportsUIState}, Settings: ${userCompany.settings}';
     //return 'UserCompany Settngs: ${userCompany.settings}, User Settings: ${user.userCompany.settings}';
     return 'Layout: ${prefState.appLayout}, Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
   }
diff --git a/lib/redux/reports/reports_middleware.dart b/lib/redux/reports/reports_middleware.dart
index 7a3c9ec34..d6e2f20fb 100644
--- a/lib/redux/reports/reports_middleware.dart
+++ b/lib/redux/reports/reports_middleware.dart
@@ -19,14 +19,13 @@ List<Middleware<AppState>> createStoreReportsMiddleware() {
 Middleware<AppState> _viewReports() {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as ViewReports;
-    final uiState = store.state.uiState;
 
     if (!action.force &&
         hasChanges(store: store, context: action.context, action: action)) {
       return;
     }
 
-    final route = ReportsScreen.route;
+    const route = ReportsScreen.route;
 
     next(action);
 
diff --git a/lib/ui/reports/client_report.dart b/lib/ui/reports/client_report.dart
index 1c6f4480b..048f8f6c4 100644
--- a/lib/ui/reports/client_report.dart
+++ b/lib/ui/reports/client_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/credit_report.dart b/lib/ui/reports/credit_report.dart
index 52d7ed6ef..d649247bf 100644
--- a/lib/ui/reports/credit_report.dart
+++ b/lib/ui/reports/credit_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/document_report.dart b/lib/ui/reports/document_report.dart
index d730eb142..c3314ac47 100644
--- a/lib/ui/reports/document_report.dart
+++ b/lib/ui/reports/document_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/expense_report.dart b/lib/ui/reports/expense_report.dart
index a133e87c1..230d89443 100644
--- a/lib/ui/reports/expense_report.dart
+++ b/lib/ui/reports/expense_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/invoice_report.dart b/lib/ui/reports/invoice_report.dart
index 70ef5f48f..90e39e512 100644
--- a/lib/ui/reports/invoice_report.dart
+++ b/lib/ui/reports/invoice_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/payment_report.dart b/lib/ui/reports/payment_report.dart
index 46e30c2c2..e51ee428c 100644
--- a/lib/ui/reports/payment_report.dart
+++ b/lib/ui/reports/payment_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/product_report.dart b/lib/ui/reports/product_report.dart
index 706e542e3..a0cf82a1a 100644
--- a/lib/ui/reports/product_report.dart
+++ b/lib/ui/reports/product_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index 23853c9e7..2f1b698a2 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -17,7 +17,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
-import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
 import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen_vm.dart';
@@ -527,7 +526,7 @@ ReportColumnType getReportColumnType(String column, BuildContext context) {
     return ReportColumnType.dateTime;
   } else if (['date', 'due_date'].contains(column)) {
     return ReportColumnType.date;
-  } else if (['balance', 'paid_to_date', 'amount', 'quantity', 'price', 'cost']
+  } else if (['balance', 'paid_to_date', 'amount', 'quantity', 'pridce', 'cost']
       .contains(column)) {
     return ReportColumnType.number;
   } else if (['is_active'].contains(column)) {
@@ -668,11 +667,12 @@ class ReportResult {
   }
 
   List<String> sortedColumns(BuildContext context) {
-    final store = StoreProvider.of<AppState>(context);
-    final group = store.state.uiState.reportsUIState.group;
     final data = columns.toList();
 
     /*
+    final store = StoreProvider.of<AppState>(context);
+    final group = store.state.uiState.reportsUIState.group;
+
     if (group.isNotEmpty) {
       data.remove(group);
       data.insert(0, group);
diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart
index 3a9afa02d..19352225c 100644
--- a/lib/ui/reports/reports_screen_vm.dart
+++ b/lib/ui/reports/reports_screen_vm.dart
@@ -1,5 +1,3 @@
-//import 'dart:html';
-import 'dart:collection';
 import 'dart:io' as file;
 import 'package:flutter_share/flutter_share.dart';
 import 'package:built_collection/built_collection.dart';
@@ -284,8 +282,8 @@ class ReportsScreenVM {
               '${state.uiState.reportsUIState.report}_report_$date.csv';
 
           if (kIsWeb) {
-            final encodedFileContents = Uri.encodeComponent(csvData);
             /*
+            final encodedFileContents = Uri.encodeComponent(csvData);
             AnchorElement(
                 href: 'data:text/plain;charset=utf-8,$encodedFileContents')
               ..setAttribute('download', filename)
diff --git a/lib/ui/reports/task_report.dart b/lib/ui/reports/task_report.dart
index cbf99a69c..e13c6f61a 100644
--- a/lib/ui/reports/task_report.dart
+++ b/lib/ui/reports/task_report.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';
diff --git a/lib/utils/enums.dart b/lib/utils/enums.dart
index c598865ce..26a368c20 100644
--- a/lib/utils/enums.dart
+++ b/lib/utils/enums.dart
@@ -1,11 +1,15 @@
 class EnumUtils {
   static String parse(dynamic enumItem) {
-    if (enumItem == null) return null;
+    if (enumItem == null) {
+      return null;
+    }
     return enumItem.toString().split('.')[1];
   }
 
   static T fromString<T>(List<T> enumValues, String value) {
-    if (value == null || enumValues == null) return null;
+    if (value == null || enumValues == null) {
+      return null;
+    }
 
     return enumValues.singleWhere(
         (enumItem) =>