diff --git a/src/data/app/ix-blazor/librarytemplate.blazor/Pages/DistributedData.razor b/src/data/app/ix-blazor/librarytemplate.blazor/Pages/DistributedData.razor
index 8073a9103..cd9e80b2e 100644
--- a/src/data/app/ix-blazor/librarytemplate.blazor/Pages/DistributedData.razor
+++ b/src/data/app/ix-blazor/librarytemplate.blazor/Pages/DistributedData.razor
@@ -22,7 +22,19 @@
     </div>
     <div class="card-body">
          //<BlazorViewDistributedData> 
-            <DistributedDataView GroupName="default"  Presentation="Command" ConfigSuffix="" EnableExport=true EnableSorting=true DisplayOnePerDataType=true />
+           <DistributedDataView Presentation="Command"
+                     GroupName="default" 
+                     ConfigSuffix="" 
+                     DisplayOnePerDataType="true" 
+                     EnableCreate="true" 
+                     EnableDelete="true" 
+                     EnableCopy="true" 
+                     EnableFiltering="true"
+                     EnableSorting="false"
+                     EnableExport="true" 
+                     EnableSendToPlc="true"
+                     EnableCreateNewFromPlc="true"
+                     />
          //</BlazorViewDistributedData>
     </div>
 </div>
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor
index 3af4cd3b2..10ff22ec2 100644
--- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor
+++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor
@@ -298,25 +298,25 @@ else
                                             </button>
                                         </Authorized>
                                     </AuthorizeView>
-
+@* 
                                     @if (EnableUpdateFromPlc)
                                     {
                                         <AuthorizeView Roles="@DataExchangeRoleNames.can_data_update_from_plc">
                                             <Authorized>
                                                 <button type="button" class="btn btn-warning px-3 py-0" title="Update" data-bs-toggle="modal" data-bs-target="#createModal-@ViewGuid"
-                                                @onclick='() => { Vm.SelectedRecord = item; ButtonOperationName = "UpdateFromPlc"; Vm.Locked(); }'>
+                                                        @onclick='() => { Vm.SelectedRecord = item; ButtonOperationName = "UpdateFromPlc"; Vm.Locked(); }'>
                                                     <i class="bi bi-cloud-upload"></i>
                                                 </button>
                                             </Authorized>
                                         </AuthorizeView>
-                                    }
+                                    } *@
 
                                     @if (EnableSendToPlc)
                                     {
                                         <AuthorizeView Roles="@DataExchangeRoleNames.can_data_send_to_plc">
                                             <Authorized>
                                                 <button type="button" class="btn btn-warning px-3 py-0" title="Send To Plc" data-bs-toggle="modal" data-bs-target="#AckSendToPlcModal-@ViewGuid"
-                                                @onclick='() => { Vm.SelectedRecord = item;}'>
+                                                        @onclick='() => { Vm.SelectedRecord = item;}'>
                                                     <i class="bi bi-box-arrow-in-down"></i>
                                                     @* <i class="bi bi-pc"></i> *@
                                                 </button>
@@ -552,7 +552,7 @@ else
                                 <span> @Localizer["Load from ALL PLCs"]</span>
                             </button>
                         }
-                        else if (ButtonOperationName.Equals("UpdateFromPlc"))
+                        @* else if (ButtonOperationName.Equals("UpdateFromPlc"))
                         {
                             <button type="button" class="btn btn-primary @(!Vm.IsLockedByMeOrNull() ? "disabled" : null)" data-bs-dismiss="modal"
                                     @onclick="async () => {
@@ -564,7 +564,7 @@ else
                                 <i class="bi bi-hdd-rack me-2"></i>
                                 <span> @Localizer["Update from ALL PLCs"]</span>
                             </button>
-                        }
+                        } *@
                     }
 
 
@@ -589,13 +589,13 @@ else
                             <span> @Localizer["Load from PLC into THIS repository"]</span>
                         </button>
                     }
-                    else if (ButtonOperationName.Equals("UpdateFromPlc"))
+                   @*  else if (ButtonOperationName.Equals("UpdateFromPlc"))
                     {
                         <button type="button" class="btn btn-primary @(!Vm.IsLockedByMeOrNull() ? "disabled" : null)" data-bs-dismiss="modal" @onclick="() => { Vm.UpdateFromPlc(); Vm.UnLocked(); }">
                             <i class="bi bi-hdd me-2"></i>
                             <span> @Localizer["Update from PLC into THIS repository"]</span>
                         </button>
-                    }
+                    } *@
 
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @onclick="() => { Vm.UnLocked(); }">@Localizer["Close"]</button>
                 </div>
@@ -616,18 +616,24 @@ else
                 <div class="modal-footer">
                     @if (Presentation.Equals("Command"))
                     {
-                        <AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_delete">
-                            <Authorized>
-                                <button type="button" class="btn btn-danger me-auto" data-bs-toggle="modal" data-bs-target="#deleteModal-@ViewGuid" @onclick="() => { Vm.Locked(); }">@Localizer["Delete"]</button>
-                            </Authorized>
-                        </AuthorizeView>
+                        @if (EnableDelete)
+                        {
+                            <AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_delete">
+                                <Authorized>
+                                    <button type="button" class="btn btn-danger me-auto" data-bs-toggle="modal" data-bs-target="#deleteModal-@ViewGuid" @onclick="() => { Vm.Locked(); }">@Localizer["Delete"]</button>
+                                </Authorized>
+                            </AuthorizeView>
+                        }
 
-                        <AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_copy">
-                            <Authorized>
+                        @if (EnableCopy)
+                        {
+                            <AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_copy">
+                                <Authorized>
 
-                                <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#createModal-@ViewGuid" @onclick='() => { ButtonOperationName = "Copy"; Vm.Locked(); }'>@Localizer["Copy"]</button>
-                            </Authorized>
-                        </AuthorizeView>
+                                    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#createModal-@ViewGuid" @onclick='() => { ButtonOperationName = "Copy"; Vm.Locked(); }'>@Localizer["Copy"]</button>
+                                </Authorized>
+                            </AuthorizeView>
+                        }
 
                         <AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_edit">
                             <Authorized>
@@ -636,19 +642,15 @@ else
                             </Authorized>
                         </AuthorizeView>
 
-                        <AuthorizeView Roles="@DataExchangeRoleNames.can_data_send_to_plc">
-                            <Authorized>
-
-                                <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#AckSendToPlcModal-@ViewGuid">@Localizer["Send to PLC"]</button>
-                            </Authorized>
-                        </AuthorizeView>
-
-                        <AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_delete">
-                            <Authorized>
-
-                            </Authorized>
-                        </AuthorizeView>
+                        @if (EnableSendToPlc)
+                        {
+                            <AuthorizeView Roles="@DataExchangeRoleNames.can_data_send_to_plc">
+                                <Authorized>
 
+                                    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#AckSendToPlcModal-@ViewGuid">@Localizer["Send to PLC"]</button>
+                                </Authorized>
+                            </AuthorizeView>
+                        }
 
                     }
                     <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#changesModal-@ViewGuid">@Localizer["Changes"]</button>
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs
index a7e5667f8..f3c22df71 100644
--- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs
+++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs
@@ -57,7 +57,7 @@ public partial class DataExchangeView : ComponentBase, IDisposable
     [Parameter] public bool EnableExport { get; set; } = false; 
     [Parameter] public bool EnableSorting { get; set; } = false;
 
-    [Parameter] public bool EnableUpdateFromPlc { get; set; } = false;
+    //[Parameter] public bool EnableUpdateFromPlc { get; set; } = false;
 
     [Parameter] public RenderFragment ChildContent { get; set; }
 
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs
index 9cf981572..4f2de13ff 100644
--- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs
+++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs
@@ -450,42 +450,42 @@ public async Task LoadFromPlc()
             }
         }
 
-        public async Task UpdateFromPlc()
-        {
-            try
-            {
-                var identifier = SelectedRecord.DataEntityId;
-
-                var refdata = DataExchange.CloneDataObject();
-
-                var DataEntityId = (refdata as IAxoDataEntity).DataEntityId;
-
-                List<ITwinPrimitive> batchRedElements = new();
-
-                batchRedElements.Add(DataEntityId);
-
-                await refdata.GetConnector().ReadBatchAsync(batchRedElements);
-
-                if (DataEntityId.Cyclic != identifier)
-                {
-                    AlertDialogService?.AddAlertDialog(eAlertType.Warning, "Update error", $"Online record has different ID that requested to update: {DataEntityId.Cyclic}/{identifier}!", 14);
-                    return;
-                }
-
-                await DataExchange.RemoteUpdate(identifier);
-                AlertDialogService?.AddAlertDialog(eAlertType.Success, "Update from PLC!", "Item was successfully updated from PLC!", 10);
-                AxoApplication.Current.Logger.Information($"Updated from Plc {identifier} into {DataExchange.PresentableInstanceName} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity);
-            }
-            catch (Exception e)
-            {
-                AlertDialogService?.AddAlertDialog(eAlertType.Danger, "Failed to update a record from the controller", e.Message, 10);
-            }
-            finally
-            {
-                await FillObservableRecordsAsync();
-                CreateItemId = null;
-            }
-        }
+        //public async Task UpdateFromPlc()
+        //{
+        //    try
+        //    {
+        //        var identifier = SelectedRecord.DataEntityId;
+
+        //        var refdata = DataExchange.CloneDataObject();
+
+        //        var DataEntityId = (refdata as IAxoDataEntity).DataEntityId;
+
+        //        List<ITwinPrimitive> batchRedElements = new();
+
+        //        batchRedElements.Add(DataEntityId);
+
+        //        await refdata.GetConnector().ReadBatchAsync(batchRedElements);
+
+        //        if (DataEntityId.Cyclic != identifier)
+        //        {
+        //            AlertDialogService?.AddAlertDialog(eAlertType.Warning, "Update error", $"Online record has different ID that requested to update: {DataEntityId.Cyclic}/{identifier}!", 14);
+        //            return;
+        //        }
+
+        //        await DataExchange.RemoteUpdate(identifier);
+        //        AlertDialogService?.AddAlertDialog(eAlertType.Success, "Update from PLC!", "Item was successfully updated from PLC!", 10);
+        //        AxoApplication.Current.Logger.Information($"Updated from Plc {identifier} into {DataExchange.PresentableInstanceName} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity);
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        AlertDialogService?.AddAlertDialog(eAlertType.Danger, "Failed to update a record from the controller", e.Message, 10);
+        //    }
+        //    finally
+        //    {
+        //        await FillObservableRecordsAsync();
+        //        CreateItemId = null;
+        //    }
+        //}
 
 
         public Task ExportDataAsync(string path)
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/IDataExchangeGlobalActions.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/IDataExchangeGlobalActions.cs
index 72bd52b60..329bce351 100644
--- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/IDataExchangeGlobalActions.cs
+++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/IDataExchangeGlobalActions.cs
@@ -7,7 +7,7 @@ public interface IDataExchangeGlobalActions
         public Task Copy(string identifier, string newIdentifier);
         public Task Create(string identifier);
         public Task CreateNewFromPlc(string identifier);
-        public Task UpdateFromPlc(string identifier);
+        //public Task UpdateFromPlc(string identifier);
         public Task SendToPlc(string identifier);
     }
 
diff --git a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs
index 4031d7941..31643bb63 100644
--- a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs
+++ b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs
@@ -16,14 +16,11 @@ public partial class DistributedDataSelectorView
         [Parameter, EditorRequired]
         public string GroupName { get; set; }
 
-        [Parameter]
-        public string ConfigSuffix { get; set; } = "";
+        [Parameter] public string ConfigSuffix { get; set; } = "";
 
-        [Parameter]
-        public PredicateContainer? InjectedPredicateContainer { set; get; }
+        [Parameter] public PredicateContainer? InjectedPredicateContainer { set; get; }
 
-        [Parameter]
-        public Action<string>? OnDataSend { get; set; }
+        [Parameter] public Action<string>? OnDataSend { get; set; }
 
 
         [Inject]
@@ -62,7 +59,7 @@ protected override async Task OnInitializedAsync()
 
                 if (DataFragments != null)
                 {
-                    DistributedVM = new DistributedDataSelectorViewModel(DistributedExchangeService, GroupName, AlertService, InjectedPredicateContainer);
+                    DistributedVM = new DistributedDataSelectorViewModel(AlertService, Authentication, DistributedExchangeService, GroupName, ConfigSuffix, InjectedPredicateContainer);
 
 
                     await DistributedVM.ReadAllCurrentEntityIds();
diff --git a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorViewModel.cs b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorViewModel.cs
index 154d88006..e0f03f5d4 100644
--- a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorViewModel.cs
+++ b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorViewModel.cs
@@ -21,9 +21,10 @@ public partial class DistributedDataSelectorViewModel
         protected volatile object _fragmentEntityIdsLock = new object();
         protected volatile object _transmitedEntityIdsLock = new object();
 
+        protected readonly AuthenticationStateProvider Authentication;
         protected readonly IDistributedDataExchangeService distributedExchangeService;
         protected readonly IAlertService AlertService;
-        protected readonly string ExchangeGroup;
+        protected readonly string GroupName;
 
         protected readonly PredicateContainer InjectedPredicateContainer;
         protected IEnumerable<IAxoDataExchange> RepresentativeExchanges { get; set; } // one per type
@@ -73,20 +74,27 @@ public List<PlainSymbolBuilder> PlainBuilders
             }
         }
 
-        public DistributedDataSelectorViewModel(IDistributedDataExchangeService distributedExchangeService, string exchangeGroup, IAlertService alertService, PredicateContainer injectePredicateContainer)
+        public DistributedDataSelectorViewModel(
+            IAlertService alertService,
+            AuthenticationStateProvider authentication,
+            IDistributedDataExchangeService distributedExchangeService,
+            string groupName,
+            string configuraionSuffix,
+            PredicateContainer injectePredicateContainer )
         {
             this.distributedExchangeService = distributedExchangeService;
             this.AlertService = alertService;
             this.InjectedPredicateContainer = injectePredicateContainer;
-            this.ExchangeGroup = exchangeGroup;
+            this.GroupName = groupName;
+            this.Authentication = authentication;
 
             InitializeViewModel();
         }
 
         private void InitializeViewModel()
         {
-            RepresentativeExchanges = distributedExchangeService.GetExchanges(this.ExchangeGroup, true);
-            AllExchanges = distributedExchangeService.GetExchanges(this.ExchangeGroup, false);
+            RepresentativeExchanges = distributedExchangeService.GetExchanges(this.GroupName, true);
+            AllExchanges = distributedExchangeService.GetExchanges(this.GroupName, false);
             MainExchange = RepresentativeExchanges.First();
 
         }
@@ -216,7 +224,7 @@ public async Task SendToPlc(string identifier)
             List<string> sentToPlc = new List<string>();
             List<string> notExistInDb = new List<string>();
 
-            foreach (var exchangeGroup in distributedExchangeService.GetExchanges(this.ExchangeGroup, false).GroupBy(p => p.GetPlainTypes().First().FullName))
+            foreach (var exchangeGroup in distributedExchangeService.GetExchanges(this.GroupName, false).GroupBy(p => p.GetPlainTypes().First().FullName))
             {
                 if (!exchangeGroup.First().Repository.Exists(identifier))
                 {
@@ -237,15 +245,42 @@ public async Task SendToPlc(string identifier)
 
             if (sentToPlc.Count > 0)
             {
-                string updatedRecords = string.Join(", ", sentToPlc);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Send record", $"Data with ID: \"{identifier}\"  was send for: {updatedRecords}!", 7);
+                string sentExchanges = string.Join(", ", sentToPlc);
+
+                // Alert
+                AlertService?.AddAlertDialog(
+                    eAlertType.Info,
+                    "Send record",
+                    $"Record \"{identifier}\" was sent to: {sentExchanges}.",
+                    7
+                );
+
+                // Log
+                AxoApplication.Current.Logger.Information(
+                    $"Sent record \"{identifier}\" to: {sentExchanges} by user action.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
             }
 
             if (notExistInDb.Count > 0)
             {
                 string notEqualEntityIds = string.Join(", ", notExistInDb);
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Send error", $"Rrecord has not exist in a Database for: {notEqualEntityIds}!", 14);
+
+                // Alert
+                AlertService?.AddAlertDialog(
+                    eAlertType.Warning,
+                    "Send error",
+                    $"Record does not exist in the database for: {notEqualEntityIds}.",
+                    14
+                );
+
+                // Log
+                AxoApplication.Current.Logger.Warning(
+                    $"Sending record \"{identifier}\" by user action failed – record does not exist in database for: {notEqualEntityIds}.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
             }
+
         }
 
         public async Task ReadAllCurrentEntityIds()
diff --git a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor
index 72d650993..06d2e642d 100644
--- a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor
+++ b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor
@@ -59,13 +59,13 @@
 
         @if (DistributedVM.InjectedEntities != null && DistributedVM.InjectedEntities.Count > 0)
         {
-            <button type="button" class="btn btn-secondary px-1 py-1"
+            <button type="button" class="btn @(DistributedVM.EnableInjectedExternalIds ? "btn-warning" : "btn-primary") px-1 py-1"
                     @onclick="() => DistributedVM.TogleExternalEntityIdsInjection()">
 
                 @if (DistributedVM.EnableInjectedExternalIds)
                 {
                     <span> @Localizer["Disable Injected Ids"]</span>
-                    <span>(@DistributedVM.InjectedEntities.Count)</span>
+                    <span>(@DistributedVM.InjectedEntities?.Count)</span>
                 }
                 else
                 {
@@ -122,10 +122,10 @@ else
     }
     else
     {
-        if (DistributedVM.DataFragments != null)
+        if (DistributedVM.DisplayedDataFragments != null)
         {
             <ul class="nav nav-tabs mb-3">
-                @foreach (var exchange in DistributedVM.DataFragments)
+                @foreach (var exchange in DistributedVM.DisplayedDataFragments)
                 {
                     <li class="nav-item">
                         <button type="button"
@@ -148,15 +148,11 @@ else
                           EnableCreate="@this.EnableCreate"
                           EnableCopy="@this.EnableCopy"
                           EnableDelete="@this.EnableDelete"
-
                           EnableCreateNewFromPlc="@this.EnableCreateNewFromPlc"
                           EnableSendToPlc="@this.EnableSendToPlc"
-                          EnableUpdateFromPlc="@this.EnableUpdateFromPlc"
-
                           EnableFiltering="@this.EnableFiltering"
                           EnableSorting="@this.EnableSorting"
-                          EnableExport="@this.EnableExport"
->
+                          EnableExport="@this.EnableExport">
 
             @foreach (var column in DistributedVM.ExchangeConfig.Collumns)
             {
diff --git a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor.cs b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor.cs
index ca9ab8719..77da6ed06 100644
--- a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor.cs
+++ b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor.cs
@@ -1,4 +1,5 @@
-using AXOpen.Base.Dialogs;
+using AXOpen.Base.Data.Query;
+using AXOpen.Base.Dialogs;
 using Humanizer.DateTimeHumanizeStrategy;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -27,12 +28,17 @@ public partial class DistributedDataView
         [Parameter] public bool EnableDelete { get; set; } = false;
         [Parameter] public bool EnableSendToPlc { get; set; } = false;
         [Parameter] public bool EnableCreateNewFromPlc { get; set; } = false;
-        [Parameter] public bool EnableUpdateFromPlc { get; set; } = false;
+        //[Parameter] public bool EnableUpdateFromPlc { get; set; } = false;
 
         [Parameter] public bool EnableFiltering { get; set; } = false;
         [Parameter] public bool EnableExport { get; set; } = false;
         [Parameter] public bool EnableSorting { get; set; } = false;
 
+
+        [Parameter] public List<string>? InjectedEntities { get; set; }
+        [Parameter] public PredicateContainer? InjectedPredicateContainer { get; set; }
+
+
         [Inject]
         public IJSRuntime JSRuntime { set; get; }
 
@@ -69,15 +75,19 @@ protected override async Task OnInitializedAsync()
 
             if (DistributedExchangeService.IsExistGroup(GroupName))
             {
-                IEnumerable<IAxoDataExchange> DataFragments;
-
-                DataFragments = DistributedExchangeService.GetExchanges(GroupName, DisplayOnePerDataType);
-
-                if (DataFragments != null)
-                {
-                    this.DistributedVM = new DistributedDataViewModel(DataFragments, this.AlertService, this.Authentication, this.ExchangeConfigService);
-                    this.DistributedVM.StateHasChangedDelegate = StateHasChanged;
-                }
+                this.DistributedVM = new DistributedDataViewModel(
+                    this.AlertService,
+                    this.Authentication,
+                    this.DistributedExchangeService,
+                    this.ExchangeConfigService,
+                    this.GroupName,
+                    this.DisplayOnePerDataType,
+                    this.ConfigSuffix,
+                    this.InjectedEntities,
+                    this.InjectedPredicateContainer
+                    );
+
+                this.DistributedVM.StateHasChangedDelegate = StateHasChanged;
             }
             else
             {
diff --git a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataViewModel.cs b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataViewModel.cs
index 1f032f78b..8664cf375 100644
--- a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataViewModel.cs
+++ b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataViewModel.cs
@@ -18,30 +18,64 @@ namespace AXOpen.Data
 {
     public partial class DistributedDataViewModel : IDataExchangeQueryViewModel, IDataExchangeGlobalActions
     {
-        protected volatile object _fragmentEntityIdsLock = new object();
-
-        protected readonly IAlertService AlertService;
-
         protected readonly AuthenticationStateProvider Authentication;
 
+        protected readonly IAlertService AlertService;
+        protected readonly IDistributedDataExchangeService DistributedExchangeService;
         protected readonly IAxoDataExchangeConfigurationService ConfigurationService;
 
+
+        protected readonly string GroupName = "";
+        protected readonly bool DisplayOnePerDataType;
         protected readonly string ConfiguraionSuffix = "";
 
         public DistributedDataViewModel(
-            IEnumerable<IAxoDataExchange> dataFragments,
             IAlertService alertService,
             AuthenticationStateProvider authentication,
+            IDistributedDataExchangeService distributedExchangeService,
             IAxoDataExchangeConfigurationService configuraionService,
-            string configuraionSuffix = ""
+            string groupName,
+            bool displayOnePerDataType,
+            string configuraionSuffix,
+             List<string>? injectedEntities,
+             PredicateContainer? injectedPredicateContainer
+
             )
         {
-            DataFragments = dataFragments;
             AlertService = alertService;
             Authentication = authentication;
             ConfigurationService = configuraionService;
+            DistributedExchangeService = distributedExchangeService;
+            GroupName = groupName;
+            DisplayOnePerDataType = displayOnePerDataType;
             ConfiguraionSuffix = configuraionSuffix;
-            InitializeViewModel(DataFragments.First());
+
+            if ( injectedEntities != null) InjectedEntities = injectedEntities;
+            
+            InjectedPredicateContainer = injectedPredicateContainer;
+
+            DisplayedDataFragments = DistributedExchangeService.GetExchanges(this.GroupName, this.DisplayOnePerDataType);
+
+            AllDataFragments = DistributedExchangeService.GetExchanges(this.GroupName, false);
+
+            if (InjectedPredicateContainer != null)
+            {
+                var idsFromPredicates = DisplayedDataFragments.GetEntityIds(this.InjectedPredicateContainer);
+                if (idsFromPredicates != null && idsFromPredicates.Count > 0)
+                {
+                    if (InjectedEntities == null)
+                    {
+                        injectedEntities = idsFromPredicates;
+                    }
+                    else
+                    {
+                        InjectedEntities.AddRange(idsFromPredicates);
+                        InjectedEntities = InjectedEntities.Distinct().ToList();
+                    }
+                }
+            }
+
+            InitializeSelectedViewModel(DisplayedDataFragments.First());
         }
 
         #region IDataExchangeQueryViewModel
@@ -54,13 +88,13 @@ public IEnumerable<Type> GetPlainTypes()
             {
                 _PlainerTypes = new List<Type>();
 
-                if (DataFragments == null)
+                if (DisplayedDataFragments == null)
                 {
                     _PlainerTypes = new List<Type>();
                 }
                 else
                 {
-                    foreach (var exchange in DataFragments)
+                    foreach (var exchange in DisplayedDataFragments)
                     {
                         _PlainerTypes.Add(exchange.GetPlainTypes().First());
                     }
@@ -79,27 +113,7 @@ public Task FillObservableRecordsAsync(PredicateContainer? predicates = null)
                 }
             }
 
-            List<List<string>> fragmentEntities = new();
-
-            Parallel.ForEach(DataFragments.Where(fragment => predicates.ContainsType(fragment.GetPlainTypes().First())), fragment =>
-            {
-                var ids = fragment.GetEntityIds(predicates).ToList();
-                lock (_fragmentEntityIdsLock)
-                {
-                    fragmentEntities.Add(ids);
-                }
-            });
-
-            List<string> commonEntities = fragmentEntities.Count > 1
-                ? fragmentEntities.Skip(1)
-                    .Aggregate(new HashSet<string>(fragmentEntities.First()), (common, next) =>
-                    {
-                        common.IntersectWith(next);
-                        return common;
-                    })
-                    .ToList()
-                : fragmentEntities.FirstOrDefault() ?? new List<string>();
-
+            List<string> commonEntities = DisplayedDataFragments.GetEntityIds(predicates);
             LastFragmentQueryCount = commonEntities.Count;
 
             EnableInjectLocalIds = true;
@@ -145,6 +159,14 @@ public void InvokeStateHasChanged()
 
         public AxoDataExchangeConfiguration ExchangeConfig { get; set; } = new();
 
+        public DataExchangeViewModel SelectedManagerVm { get; set; }
+
+        public int LastFragmentQueryCount { set; get; }
+
+        public IEnumerable<IAxoDataExchange> DisplayedDataFragments { get; private set; } // used for View 
+        public IEnumerable<IAxoDataExchange> AllDataFragments { get; private set; } // used for load to plc
+        public PredicateContainer InjectedPredicateContainer { set; get; }
+
         #region IDataExchangeGlogalActions
 
         public async Task Create(string identifier)
@@ -158,13 +180,11 @@ public async Task Create(string identifier)
             List<string> created = new List<string>();
             List<string> alreadyExistInDb = new List<string>();
 
-            foreach (var exchange in DataFragments.DistinctBy(p => p.ManagerDataTypeName))
+            foreach (var exchange in DisplayedDataFragments.DistinctBy(p => p.ManagerDataTypeName))
             {
                 if (!exchange.Repository.Exists(identifier))
                 {
-                    var plain = Activator.CreateInstance(exchange.GetPlainTypes().First());
-
-                    exchange.Repository.Create(identifier, plain);
+                    await exchange.CreateNewAsync(identifier, exchange.CloneDataObject());
                     created.Add(exchange.ManagerDataTypeName);
                 }
                 else
@@ -172,18 +192,44 @@ public async Task Create(string identifier)
                     alreadyExistInDb.Add(exchange.ManagerDataTypeName);
                 }
             }
-
             if (created.Count > 0)
             {
                 string createdRecords = string.Join(", ", created);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Create record", $"Data with ID: \"{identifier}\"  was created for: {createdRecords}!", 7);
+
+                // Alert
+                AlertService?.AddAlertDialog(
+                    eAlertType.Info,
+                    "Create new record",
+                    $"Record \"{identifier}\" was created in repositories: {createdRecords}.",
+                    7
+                );
+
+                // Log
+                AxoApplication.Current.Logger.Information(
+                    $"Created new record \"{identifier}\" in repositories: {createdRecords} by user action.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
             }
 
             if (alreadyExistInDb.Count > 0)
             {
                 string notCreatedRecords = string.Join(", ", alreadyExistInDb);
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Create record error", $"Record already exist for: {notCreatedRecords}!", 14);
+
+                // Alert
+                AlertService?.AddAlertDialog(
+                    eAlertType.Warning,
+                    "Create record error",
+                    $"Record \"{identifier}\" already exists in repositories: {notCreatedRecords}.",
+                    14
+                );
+
+                // Log
+                AxoApplication.Current.Logger.Warning(
+                    $"Creating record \"{identifier}\" by user action failed – already exists in repositories: {notCreatedRecords}.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
             }
+
         }
 
         public async Task CreateNewFromPlc(string identifier)
@@ -197,7 +243,7 @@ public async Task CreateNewFromPlc(string identifier)
             List<string> Created = new List<string>();
             List<string> NotCreated = new List<string>();
 
-            foreach (var exchange in DataFragments.DistinctBy(p => p.ManagerDataTypeName))
+            foreach (var exchange in DisplayedDataFragments.DistinctBy(p => p.ManagerDataTypeName))
             {
                 if (!exchange.Repository.Exists(identifier))
                 {
@@ -213,78 +259,145 @@ public async Task CreateNewFromPlc(string identifier)
             if (Created.Count > 0)
             {
                 string createdRecords = string.Join(", ", Created);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Create record", $"Data with ID: \"{identifier}\"  was created for: {createdRecords}!", 7);
-            }
 
-            if (NotCreated.Count > 0)
-            {
-                string notCreatedRecords = string.Join(", ", NotCreated);
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Create record error", $"Record already exist for: {notCreatedRecords}!", 14);
-            }
-        }
+                // Alert
+                AlertService?.AddAlertDialog(
+                    eAlertType.Info,
+                    "Create record from PLC",
+                    $"Record \"{identifier}\" was created in repositories: {createdRecords}.",
+                    7
+                );
 
-        public async Task UpdateFromPlc(string identifier)
-        {
-            if (string.IsNullOrEmpty(identifier))
-            {
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Update data error", "Please enter valid identifier!", 20);
-                return;
+                // Log
+                AxoApplication.Current.Logger.Information(
+                    $"Created record from PLC \"{identifier}\" in Axo: {createdRecords} by user action.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
             }
 
-            List<string> updated = new List<string>();
-            List<string> created = new List<string>();
-            List<string> notSameIdInPlc = new List<string>();
-
-            foreach (var exchange in DataFragments.DistinctBy(p => p.ManagerDataTypeName))
+            if (NotCreated.Count > 0)
             {
-                //TODO optimalize -> clone only EntityId
-                var refdata = exchange.CloneDataObject();
-
-                var DataEntityId = (refdata as IAxoDataEntity).DataEntityId;
-
-                List<ITwinPrimitive> batchRedElements = new();
-
-                batchRedElements.Add(DataEntityId);
-
-                await refdata.GetConnector().ReadBatchAsync(batchRedElements);
-
-                if (DataEntityId.Cyclic != identifier)
-                {
-                    notSameIdInPlc.Add(exchange.ManagerDataTypeName);
-                    continue;
-                }
-
-                if (exchange.Repository.Exists(identifier))
-                {
-                    await exchange.RemoteUpdate(identifier);
-                    updated.Add(exchange.ManagerDataTypeName);
-                }
-                else
-                {
-                    await exchange.RemoteCreate(identifier);
-                    created.Add(exchange.ManagerDataTypeName);
-                }
-            }
+                string notCreatedRecords = string.Join(", ", NotCreated);
 
-            if (updated.Count > 0)
-            {
-                string updatedRecords = string.Join(", ", updated);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Update record", $"Data with ID: \"{identifier}\"  was created for: {updatedRecords}!", 7);
-            }
+                // Alert
+                AlertService?.AddAlertDialog(
+                    eAlertType.Warning,
+                    "Create record error",
+                    $"Record \"{identifier}\" already exists in repositories: {notCreatedRecords}.",
+                    14
+                );
 
-            if (created.Count > 0)
-            {
-                string createdRecords = string.Join(", ", created);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Crete record", $"Data with ID: \"{identifier}\"  was created for: {createdRecords}!", 7);
+                // Log
+                AxoApplication.Current.Logger.Warning(
+                    $"Creating record \"{identifier}\" by user action failed – already exists in repositories: {notCreatedRecords}.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
             }
 
-            if (notSameIdInPlc.Count > 0)
-            {
-                string notEqualEntityIds = string.Join(", ", notSameIdInPlc);
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Update error", $"Online record has different ID that requested to update: {notEqualEntityIds}!", 14);
-            }
         }
 
+        //public async Task UpdateFromPlc(string identifier)
+        //{
+        //    if (string.IsNullOrEmpty(identifier))
+        //    {
+        //        AlertService?.AddAlertDialog(eAlertType.Warning, "Update data error", "Please enter valid identifier!", 20);
+        //        return;
+        //    }
+
+        //    List<string> updated = new List<string>();
+        //    List<string> created = new List<string>();
+        //    List<string> notSameIdInPlc = new List<string>();
+
+        //    foreach (var exchange in DisplayedDataFragments.DistinctBy(p => p.ManagerDataTypeName))
+        //    {
+        //        //TODO optimalize -> clone only EntityId
+        //        var refdata = exchange.CloneDataObject();
+
+        //        var DataEntityId = (refdata as IAxoDataEntity).DataEntityId;
+
+        //        List<ITwinPrimitive> batchRedElements = new();
+
+        //        batchRedElements.Add(DataEntityId);
+
+        //        await refdata.GetConnector().ReadBatchAsync(batchRedElements);
+
+        //        if (DataEntityId.Cyclic != identifier)
+        //        {
+        //            notSameIdInPlc.Add(exchange.ManagerDataTypeName);
+        //            continue;
+        //        }
+
+        //        if (exchange.Repository.Exists(identifier))
+        //        {
+        //            await exchange.RemoteUpdate(identifier);
+        //            updated.Add(exchange.ManagerDataTypeName);
+        //        }
+        //        else
+        //        {
+        //            await exchange.RemoteCreate(identifier);
+        //            created.Add(exchange.ManagerDataTypeName);
+        //        }
+        //    }
+
+        //    if (updated.Count > 0)
+        //    {
+        //        string updatedInRepositories = string.Join(", ", updated);
+
+        //        // Alert
+        //        AlertService?.AddAlertDialog(
+        //            eAlertType.Info,
+        //            "Update record",
+        //            $"Record \"{identifier}\" was updated in repositories: {updatedInRepositories}.",
+        //            7
+        //        );
+
+        //        // Log
+        //        AxoApplication.Current.Logger.Information(
+        //            $"Updated record \"{identifier}\" in repositories: {updatedInRepositories} by user action.",
+        //            Authentication.GetAuthenticationStateAsync().Result.User.Identity
+        //        );
+        //    }
+
+        //    if (created.Count > 0)
+        //    {
+        //        string createdInRepositories = string.Join(", ", created);
+
+        //        // Alert
+        //        AlertService?.AddAlertDialog(
+        //            eAlertType.Info,
+        //            "Create record",
+        //            $"Record \"{identifier}\" was created in repositories: {createdInRepositories}.",
+        //            7
+        //        );
+
+        //        // Log
+        //        AxoApplication.Current.Logger.Information(
+        //            $"Created record \"{identifier}\" in repositories: {createdInRepositories} by user action.",
+        //            Authentication.GetAuthenticationStateAsync().Result.User.Identity
+        //        );
+        //    }
+
+        //    if (notSameIdInPlc.Count > 0)
+        //    {
+        //        string notEqualEntityIds = string.Join(", ", notSameIdInPlc);
+
+        //        // Alert
+        //        AlertService?.AddAlertDialog(
+        //            eAlertType.Warning,
+        //            "Update error",
+        //            $"Online records have a different ID than requested for update: {notEqualEntityIds}.",
+        //            14
+        //        );
+
+        //        // Log
+        //        AxoApplication.Current.Logger.Warning(
+        //            $"Updating record \"{identifier}\" by user action failed – mismatched IDs in: {notEqualEntityIds}.",
+        //            Authentication.GetAuthenticationStateAsync().Result.User.Identity
+        //        );
+        //    }
+
+        //}
+
         public async Task SendToPlc(string identifier)
         {
             if (string.IsNullOrEmpty(identifier))
@@ -296,7 +409,7 @@ public async Task SendToPlc(string identifier)
             List<string> sentToPlc = new List<string>();
             List<string> notExistInDb = new List<string>();
 
-            foreach (var exchangeGroup in DataFragments.GroupBy(p => p.GetPlainTypes().First().FullName))
+            foreach (var exchangeGroup in AllDataFragments.GroupBy(p => p.GetPlainTypes().First().FullName))
             {
                 if (!exchangeGroup.First().Repository.Exists(identifier))
                 {
@@ -316,14 +429,42 @@ public async Task SendToPlc(string identifier)
 
             if (sentToPlc.Count > 0)
             {
-                string updatedRecords = string.Join(", ", sentToPlc);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Send record", $"Data with ID: \"{identifier}\"  was send for: {updatedRecords}!", 7);
+                string sentExchanges = string.Join(", ", sentToPlc);
+
+                // Alert message
+                AlertService?.AddAlertDialog(
+                    eAlertType.Info,
+                    "Send record",
+                    $"Record \"{identifier}\" was sent to exchanges: {sentExchanges} by user action.",
+                    7
+                );
+
+                // Log message
+                AxoApplication.Current.Logger.Information(
+                    $"Sent record \"{identifier}\" to exchanges: {sentExchanges} by user action.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
+
             }
 
             if (notExistInDb.Count > 0)
             {
-                string notEqualEntityIds = string.Join(", ", notExistInDb);
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Send error", $"Rrecord has not exist in a Database for: {notEqualEntityIds}!", 14);
+                string notExistInRepos = string.Join(", ", notExistInDb);
+
+                // Alert message
+                AlertService?.AddAlertDialog(
+                    eAlertType.Warning,
+                    "Send error",
+                    $"Record \"{identifier}\" does not exist in the database for: {notExistInRepos}.",
+                    14
+                );
+
+                // Log message
+                AxoApplication.Current.Logger.Warning(
+                    $"Sending record \"{identifier}\" failed – record does not exist in the database for: {notExistInRepos} by user action.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
+
             }
         }
 
@@ -345,7 +486,7 @@ public async Task Copy(string identifier, string newIdentifier)
             List<string> notExist = new List<string>();
             List<string> alreadyExist = new List<string>();
 
-            foreach (var exchange in DataFragments.DistinctBy(p => p.ManagerDataTypeName))
+            foreach (var exchange in DisplayedDataFragments.DistinctBy(p => p.ManagerDataTypeName))
             {
                 if (exchange.Repository.Exists(identifier))
                 {
@@ -354,6 +495,7 @@ public async Task Copy(string identifier, string newIdentifier)
                         var newPlain = exchange.Repository.Read(identifier);
                         (newPlain as dynamic).DataEntityId = newIdentifier;
                         exchange.Repository.Create(newIdentifier, newPlain);
+                        copied.Add(exchange.ManagerDataTypeName);
                     }
                     else
                     {
@@ -369,19 +511,22 @@ public async Task Copy(string identifier, string newIdentifier)
             if (copied.Count > 0)
             {
                 string createdRecords = string.Join(", ", copied);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Copied record", $"Data with ID: \"{identifier}\"  was created for: {createdRecords}!", 7);
+                AlertService?.AddAlertDialog(eAlertType.Info, "Copied record", $"Data with ID: \"{identifier}\" was created for: {createdRecords}!", 7);
+                AxoApplication.Current.Logger.Information($"Copying record \"{identifier}\" with new ID \"{newIdentifier}\" into repositories {createdRecords} by user action was successful.", Authentication.GetAuthenticationStateAsync().Result.User.Identity);
             }
 
             if (alreadyExist.Count > 0)
             {
                 string alreadyExistRecords = string.Join(", ", alreadyExist);
                 AlertService?.AddAlertDialog(eAlertType.Warning, "Copied error", $"Record already exist for: {alreadyExistRecords}!", 14);
+                AxoApplication.Current.Logger.Warning($"Copying record \"{identifier}\" into repositories {alreadyExistRecords} by user action failed – record already exist.", Authentication.GetAuthenticationStateAsync().Result.User.Identity);
             }
 
             if (notExist.Count > 0)
             {
                 string notExistRecords = string.Join(", ", notExist);
                 AlertService?.AddAlertDialog(eAlertType.Warning, "Copied error", $"Source Record not exist for: {notExistRecords}!", 14);
+                AxoApplication.Current.Logger.Warning($"Copying record \"{identifier}\" into repositories {notExistRecords} by user action failed – record does not exist.", Authentication.GetAuthenticationStateAsync().Result.User.Identity);
             }
         }
 
@@ -396,7 +541,7 @@ public async Task Delete(string identifier)
             List<string> notExist = new List<string>();
             List<string> deleted = new List<string>();
 
-            foreach (var exchange in DataFragments.DistinctBy(p => p.ManagerDataTypeName))
+            foreach (var exchange in DisplayedDataFragments.DistinctBy(p => p.ManagerDataTypeName))
             {
                 if (exchange.Repository.Exists(identifier))
                 {
@@ -411,13 +556,41 @@ public async Task Delete(string identifier)
 
             if (deleted.Count > 0)
             {
-                string createdRecords = string.Join(", ", deleted);
-                AlertService?.AddAlertDialog(eAlertType.Info, "Delete record", $"Data with ID: \"{identifier}\"  was deleted for: {createdRecords}!", 7);
+                string deletedInRepos = string.Join(", ", deleted);
+
+                // Alert message 
+                AlertService?.AddAlertDialog(
+                    eAlertType.Info,
+                    "Delete record",
+                    $"Record \"{identifier}\" was deleted from repositories: {deletedInRepos}.",
+                    7
+                );
+
+                // Log message 
+                AxoApplication.Current.Logger.Information(
+                    $"Deleted record \"{identifier}\" from repositories: {deletedInRepos} by user action was successful.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
+
             }
             if (notExist.Count > 0)
             {
-                string notCreatedRecords = string.Join(", ", notExist);
-                AlertService?.AddAlertDialog(eAlertType.Warning, "Delete error", $"Source Record not exist for: {notCreatedRecords}!", 14);
+                string notExistInRepos = string.Join(", ", notExist);
+
+                // Alert message
+                AlertService?.AddAlertDialog(
+                    eAlertType.Warning,
+                    "Delete error",
+                    $"Source record does not exist in repositories: {notExistInRepos}.",
+                    14
+                );
+
+                // Log message
+                AxoApplication.Current.Logger.Warning(
+                    $"Deleting record \"{identifier}\" by user action failed – record does not exist in repositories: {notExistInRepos}.",
+                    Authentication.GetAuthenticationStateAsync().Result.User.Identity
+                );
+
             }
         }
 
@@ -435,7 +608,7 @@ public async Task SelectManager(IAxoDataExchange exchange)
 
             if (exchange != null)
             {
-                InitializeViewModel(exchange);
+                InitializeSelectedViewModel(exchange);
 
                 await SelectedManagerVm.FillObservableRecordsAsync();
             }
@@ -456,7 +629,7 @@ private void SelectCongiguration(IAxoDataExchange exchange)
             }
         }
 
-        protected void InitializeViewModel(IAxoDataExchange exchange)
+        protected void InitializeSelectedViewModel(IAxoDataExchange exchange)
         {
             if (this.SelectedManagerVm != null)
             {
@@ -500,8 +673,11 @@ protected List<string> MergeInjectedEntities()
             }
             else if (this.EnableInjectedExternalIds && !this.EnableInjectLocalIds)
             {
-                ids.AddRange(this.InjectedEntities);
-                ids = ids.Distinct().ToList();
+                if (this.InjectedEntities != null)
+                {
+                    ids.AddRange(this.InjectedEntities);
+                    ids = ids.Distinct().ToList();
+                }
             }
 
             return ids;
@@ -529,19 +705,13 @@ public async Task RefreshInjectedIds()
             SelectedManagerVm.InvokeStateHasChanged();
         }
 
-        public DataExchangeViewModel SelectedManagerVm { get; set; }
-
-        public int LastFragmentQueryCount { set; get; }
-
-        public IEnumerable<IAxoDataExchange> DataFragments { get; private set; }
-        public PredicateContainer InjectedPredicateContainer { set; get; }
 
         public Dictionary<string, List<IBrowsableDataObject>> GetRecords(PredicateContainer predicates,
             int limit, int skip)
         {
             List<List<string>> fragmentEntities = new();
 
-            Parallel.ForEach(DataFragments.Where(fragment => predicates.ContainsType(fragment.GetPlainTypes().First())), fragment =>
+            Parallel.ForEach(DisplayedDataFragments.Where(fragment => predicates.ContainsType(fragment.GetPlainTypes().First())), fragment =>
             {
                 var ids = fragment.GetEntityIds(predicates).ToList();
                 lock (fragmentEntities)
@@ -578,7 +748,7 @@ public IEnumerable<string> GetEntityIds(PredicateContainer predicates)
         {
             List<List<string>> fragmentEntities = new();
 
-            Parallel.ForEach(DataFragments.Where(fragment => predicates.ContainsType(fragment.GetPlainTypes().First())), fragment =>
+            Parallel.ForEach(DisplayedDataFragments.Where(fragment => predicates.ContainsType(fragment.GetPlainTypes().First())), fragment =>
             {
                 var ids = fragment.GetEntityIds(predicates).ToList();
                 lock (fragmentEntities)
@@ -608,7 +778,7 @@ public IEnumerable<string> GetEntityIds(PredicateContainer predicates)
 
         public IEnumerable<string> GetFromFirstExchageExistingIds()
         {
-            List<string> Entities = DataFragments.First().GetEntityIds(new PredicateContainer()).ToList();
+            List<string> Entities = DisplayedDataFragments.First().GetEntityIds(new PredicateContainer()).ToList();
             return Entities;
         }
 
diff --git a/src/data/src/AXOpen.Data/Distributed/DistributedDataExchangeExtension.cs b/src/data/src/AXOpen.Data/Distributed/DistributedDataExchangeExtension.cs
new file mode 100644
index 000000000..e8ec26426
--- /dev/null
+++ b/src/data/src/AXOpen.Data/Distributed/DistributedDataExchangeExtension.cs
@@ -0,0 +1,35 @@
+using AXOpen.Base.Data.Query;
+using System.Collections.Concurrent;
+
+namespace AXOpen.Data
+{
+    public static class DistributedDataExchangeExtension
+    {
+        public static List<string> GetEntityIds(this IEnumerable<IAxoDataExchange> exchanges, PredicateContainer predicates)
+        {
+            ConcurrentBag<List<string>> filteredIds = new();
+
+            Parallel.ForEach(exchanges.Where(fragment =>
+                predicates.ContainsType(fragment.GetPlainTypes().First())), fragment =>
+                {
+                    var ids = fragment.GetEntityIds(predicates).ToList();
+                    filteredIds.Add(ids);
+                });
+
+            List<string> commonEntities = filteredIds.Count > 1
+               ? filteredIds.Skip(1)
+                   .Aggregate(new HashSet<string>(filteredIds.First()), (common, next) =>
+                   {
+                       common.IntersectWith(next);
+                       return common;
+                   })
+                   .ToList()
+               : filteredIds.FirstOrDefault() ?? new List<string>();
+
+
+            commonEntities = commonEntities.Distinct().ToList();
+
+            return commonEntities;
+        }
+    }
+}
\ No newline at end of file