diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb
index fbc4b38..ffd571f 100644
--- a/app/DD_PM_WINDREAM/frmMain.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb
@@ -91,6 +91,7 @@ Partial Class frmMain
         Me.barItemGridFontSize = New DevExpress.XtraBars.BarEditItem()
         Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
         Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsiRowCount = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -179,7 +180,6 @@ Partial Class frmMain
         Me.bwBasicData = New System.ComponentModel.BackgroundWorker()
         Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
         Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
-        Me.bsiRowCount = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -726,6 +726,11 @@ Partial Class frmMain
         Me.BarButtonItem8.Id = 42
         Me.BarButtonItem8.Name = "BarButtonItem8"
         '
+        'bsiRowCount
+        '
+        Me.bsiRowCount.Id = 43
+        Me.bsiRowCount.Name = "bsiRowCount"
+        '
         'RibbonPageStart
         '
         Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4})
@@ -1449,11 +1454,6 @@ Partial Class frmMain
         'TimerInactivity
         '
         '
-        'bsiRowCount
-        '
-        Me.bsiRowCount.Id = 43
-        Me.bsiRowCount.Name = "bsiRowCount"
-        '
         'frmMain
         '
         Me.Appearance.Options.UseFont = True
diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx
index 8c971a2..e00a0ea 100644
--- a/app/DD_PM_WINDREAM/frmMain.resx
+++ b/app/DD_PM_WINDREAM/frmMain.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAdQBCAHUAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAdwBCAHcAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -2345,6 +2345,12 @@
   <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bsiRowCount.Name" xml:space="preserve">
+    <value>bsiRowCount</value>
+  </data>
+  <data name="&gt;&gt;bsiRowCount.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -2843,12 +2849,6 @@
   <data name="&gt;&gt;TimerInactivity.Type" xml:space="preserve">
     <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;bsiRowCount.Name" xml:space="preserve">
-    <value>bsiRowCount</value>
-  </data>
-  <data name="&gt;&gt;bsiRowCount.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmMain</value>
   </data>
diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index 4c05a2b..199ccdb 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -2659,7 +2659,7 @@ Public Class frmMain
 
             End If
             GridLayout_Changed("ColumnFilterChanged")
-            RowCount
+            RowCount()
         Catch ex As Exception
             LOGGER.Error(ex.Message)
         End Try
@@ -3046,6 +3046,6 @@ Public Class frmMain
 
     Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWFItems.SubstituteFilter
         GridLayout_Changed("GridViewWFItems_SubstituteFilter")
-        RowCount
+        RowCount()
     End Sub
 End Class
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 3262858..33936d1 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -3958,6 +3958,7 @@ Public Class frmValidator
                             For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows
                                 Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString
                                 Dim oFinalIndex = oFinalIndexRow.Item("INDEXNAME")
+                                LOGGER.Debug($"Working on final index [{oFinalIndex}]...")
                                 Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED"))
                                 Dim oIndexType = 0
                                 If IDB_ACTIVE = False Then
@@ -3977,13 +3978,11 @@ Public Class frmValidator
                                         ItemWorked = False
                                     End If
                                     If Not IsNothing(oSQLCommand) Then
-                                        Dim oDBResult = _Client.GetScalarValueFromConnection(oSQLCommand, oConnectionID)
+                                        Dim oDBResult = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID)
                                         Dim oResultfromSQL As Object = ""
-
                                         If oDBResult.OK Then
                                             oResultfromSQL = oDBResult.Scalar
                                         End If
-                                        'Dim oResultfromSQL = ClassDatabase.Execute_Scalar_ConID(oSQLCommand, oConnectionID, "FinalIndex - oGUID: {oGUID}")
 
                                         If Not IsNothing(oResultfromSQL) Then
                                             LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]")