diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
index ea0aafbb..682bebc4 100644
--- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
+++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
@@ -761,9 +761,8 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I
 
             Dim oFilePath As String = My.Application.Globix.CurrentWorkfile.FilePath
             Dim oObjectStore As String = SelectedDocType.ObjectStore
+            Dim oIDBDoctypeId As Long = SelectedDocType.IDB_DoctypeID
             Dim oObjectKind As String = "DOC"
-            Dim oBusinessEntity As String = "DEFAULT"
-            ' sd
             Dim oProfileId As Integer = SelectedDocType.Guid
             Dim oAttributes As List(Of UserAttributeValue) = oValues
             Dim oOptions As New Options.ImportFileOptions
@@ -771,14 +770,13 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I
             Logger.Debug("FilePath: [{0}]", oFilePath)
             Logger.Debug("ObjectStore: [{0}]", oObjectStore)
             Logger.Debug("ObjectKind: [{0}]", oObjectKind)
-            Logger.Debug("BusinessEntity: [{0}]", oBusinessEntity)
             Logger.Debug("ProfileId: [{0}]", oProfileId)
-            Logger.Debug("BusinessEntity: [{0}]", oBusinessEntity)
+            Logger.Debug("IDB DoctypeId: [{0}]", oIDBDoctypeId)
 
             Logger.Info("Running Import")
 
             Dim oResult = Await My.Application.Service.Client.Globix_ImportFileAsync(
-                oFilePath, oProfileId, oAttributes, oObjectStore, oObjectKind, oBusinessEntity, oOptions)
+                oFilePath, oProfileId, oAttributes, oObjectStore, oObjectKind, oIDBDoctypeId, oOptions)
 
             Logger.Info("Import result: [{0}]", oResult.OK)
             Logger.Info("Imported file got ObjectId [{0}]", oResult.ObjectId)
diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb
index 6b02d018..6ece987d 100644
--- a/Modules.EDMIAPI/Client.vb
+++ b/Modules.EDMIAPI/Client.vb
@@ -230,11 +230,11 @@ Public Class Client
         pAttributeValues As List(Of UserAttributeValue),
         pObjectStoreName As String,
         pObjectKind As String,
-        pBusinessEntity As String,
+        pIDBDoctypeId As String,
         Optional pImportOptions As Options.ImportFileOptions = Nothing) As Task(Of ImportFileResponse)
         Try
             Dim oImportFile As New Modules.Globix.ImportFile(LogConfig, Channel)
-            Return Await oImportFile.RunAsync(pFilePath, pProfileId, pAttributeValues, pObjectStoreName, pObjectKind, pBusinessEntity, pImportOptions)
+            Return Await oImportFile.RunAsync(pFilePath, pProfileId, pAttributeValues, pObjectStoreName, pObjectKind, pIDBDoctypeId, pImportOptions)
 
         Catch ex As Exception
             Logger.Error(ex)
diff --git a/Service.EDMIService/GlobalState.vb b/Service.EDMIService/GlobalState.vb
index be2b2404..bb73e113 100644
--- a/Service.EDMIService/GlobalState.vb
+++ b/Service.EDMIService/GlobalState.vb
@@ -96,7 +96,7 @@ Public Class GlobalState
     Public Sub LoadObjectStores()
         _Logger.Info("Loading Object Stores")
         Try
-            Dim oSQL As String = "SELECT * FROM VWIDB_OBJECTSTORE"
+            Dim oSQL As String = "SELECT * FROM VWIDB_OBJECT_STORE"
             Dim oTable As DataTable = _MSSQL_IDB.GetDatatable(oSQL)
 
             _Logger.Info("Found [{0}] Object Stores", oTable.Rows.Count)
@@ -105,10 +105,10 @@ Public Class GlobalState
 
             For Each oRow As DataRow In oTable.Rows
                 Dim oStore As New ObjectStore() With {
-                    .Id = oRow.Item("OST_ID"),
-                    .IsArchive = oRow.Item("OS_IS_ARCHIVE"),
-                    .Path = oRow.Item("IDB_PRAEFIX"),
-                    .Title = oRow.Item("OS_TITLE")
+                    .Id = oRow.Item("GUID"),
+                    .IsArchive = oRow.Item("Archive"),
+                    .Path = oRow.Item("REL_PATH"),
+                    .Title = oRow.Item("Objectstore")
                 }
                 _Logger.Info("New Object Store [{0}]", oStore.Title)
                 oObjectStores.Add(oStore)