diff --git a/Modules.EDMIAPI/DatabaseWithFallback.vb b/Modules.EDMIAPI/DatabaseWithFallback.vb
index f7de4084..81ba72e1 100644
--- a/Modules.EDMIAPI/DatabaseWithFallback.vb
+++ b/Modules.EDMIAPI/DatabaseWithFallback.vb
@@ -272,10 +272,10 @@ Public Class DatabaseWithFallback
 
             Select Case DatabaseType
                 Case Constants.DatabaseType.ECM
-                    oResult = _Client.GetDatatableFromECM(pSQLCommand, pConnectionId)
+                    oResult = _Client.GetDatatableFromECM(pSQLCommand)
 
                 Case Constants.DatabaseType.IDB
-                    oResult = _Client.GetDatatableFromIDB(pSQLCommand, pConnectionId)
+                    oResult = _Client.GetDatatableFromIDB(pSQLCommand)
 
                 Case Else
                     Return GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
@@ -330,10 +330,13 @@ Public Class DatabaseWithFallback
 
             Select Case DatabaseType
                 Case Constants.DatabaseType.ECM
-                    oResult = _Client.GetScalarValueFromECM(pSQLCommand, pConnectionId)
+                    oResult = _Client.GetScalarValueFromECM(pSQLCommand)
 
                 Case Constants.DatabaseType.IDB
-                    oResult = _Client.GetScalarValueFromIDB(pSQLCommand, pConnectionId)
+                    oResult = _Client.GetScalarValueFromIDB(pSQLCommand)
+
+                Case Else
+                    Return GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
 
             End Select
 
@@ -383,10 +386,13 @@ Public Class DatabaseWithFallback
 
             Select Case DatabaseType
                 Case Constants.DatabaseType.ECM
-                    oResult = _Client.ExecuteNonQueryFromECM(pSQLCommand, pConnectionId)
+                    oResult = _Client.ExecuteNonQueryFromECM(pSQLCommand)
 
                 Case Constants.DatabaseType.IDB
-                    oResult = _Client.ExecuteNonQueryFromIDB(pSQLCommand, pConnectionId)
+                    oResult = _Client.ExecuteNonQueryFromIDB(pSQLCommand)
+
+                Case Else
+                    Return ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
 
             End Select