diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart
index 160ea8aa0..48f2beef7 100644
--- a/lib/ui/app/tables/entity_list.dart
+++ b/lib/ui/app/tables/entity_list.dart
@@ -209,6 +209,7 @@ class _EntityListState extends State<EntityList> {
           initialFirstRowIndex =
               (selectedIndex / rowsPerPage).floor() * rowsPerPage;
         }
+        print('## initialFirstRowIndex: $initialFirstRowIndex');
 
         return Column(
           mainAxisSize: MainAxisSize.max,
@@ -232,7 +233,7 @@ class _EntityListState extends State<EntityList> {
                   padding: const EdgeInsets.symmetric(vertical: 24),
                   child: AppPaginatedDataTable(
                     key: ValueKey(
-                        '__${uiState.filterEntityId}_${uiState.filterEntityType}_${listUIState.hashCode}_'),
+                        '__${uiState.filterEntityId}_${uiState.filterEntityType}_${listUIState.hashCode}__'),
                     onSelectAll: (value) {
                       final entities = entityList
                           .map((String entityId) => entityMap[entityId])
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 4941c275d..c817be24a 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -86,9 +86,9 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'owner_upgrade_to_paid_plan':
-          'The account owner can upgrade to a paid plan to enable the advanded settings',
+          'The account owner can upgrade to a paid plan to enable the advanced advanced settings',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -1833,7 +1833,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -3588,7 +3588,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -5343,7 +5343,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -7068,7 +7068,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -8818,7 +8818,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -10565,7 +10565,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -12311,7 +12311,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -14072,7 +14072,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -15819,7 +15819,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -17566,7 +17566,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -19315,7 +19315,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -21076,7 +21076,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -22850,7 +22850,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -24641,7 +24641,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -26437,7 +26437,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -28191,7 +28191,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -29937,7 +29937,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -31685,7 +31685,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -33437,7 +33437,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -35183,7 +35183,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -36930,7 +36930,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -38694,7 +38694,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -40442,7 +40442,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -42192,7 +42192,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -43940,7 +43940,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -45691,7 +45691,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -47442,7 +47442,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -49200,7 +49200,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -50977,7 +50977,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -52727,7 +52727,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',
@@ -54472,7 +54472,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'portrait': 'Portrait',
       'landscape': 'Landscape',
       'upgrade_to_paid_plan':
-          'Upgrade to a paid plan to enable the advanded settings',
+          'Upgrade to a paid plan to enable the advanced settings',
       'invoice_payment_terms': 'Invoice Payment Terms',
       'quote_valid_until': 'Quote Valid Until',
       'no_headers': 'No Headers',