diff --git a/TIAM.Entities/Transfers/TransferToDriver.cs b/TIAM.Entities/Transfers/TransferToDriver.cs
index 6ee48ded..894ef5f4 100644
--- a/TIAM.Entities/Transfers/TransferToDriver.cs
+++ b/TIAM.Entities/Transfers/TransferToDriver.cs
@@ -21,6 +21,9 @@ public class TransferToDriver : IEntityGuid, ITimeStampInfo, IUserProductMapping
     public virtual Transfer Transfer { get; set; }
     public virtual UserProductMapping UserProductMapping { get; set; }
 
+    /// <summary>
+    /// History LicencePlate!
+    /// </summary>
     public string LicencePlate { get; set; }
     public double Price { get; set; }
 
diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor
index b03e0d26..2f9a568a 100644
--- a/TIAMSharedUI/Pages/EditTransfers.razor
+++ b/TIAMSharedUI/Pages/EditTransfers.razor
@@ -257,9 +257,6 @@ else
     private MessageWizardModel _messageWizardModel = new();
 
     private bool _popupVisible;
-    private bool _autoCollapseDetailRow;
-
-
     public List<string> IgnoreList =
     [
         "ReceiverEmailAddress",
diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor
index d3ecd46e..e3e1f7b8 100644
--- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor
@@ -67,12 +67,10 @@
                                      SignalRClient="AdminSignalRClient"
 
                                 PageSize="12"
-                                KeyFieldName="Id"
                                      ValidationEnabled="false"
                                      DetailRowDisplayMode="GridDetailRowDisplayMode.Always"
                                 CustomizeEditModel="Grid_CustomizeEditModel"
-                                EditMode="GridEditMode.EditRow"
-                                KeyboardNavigationEnabled="true">
+                                EditMode="GridEditMode.EditRow">
                             <Columns>
                                 <DxGridCommandColumn Width="160px" />
                                 <DxGridDataColumn FieldName="Id" MinWidth="80">
diff --git a/TIAMSharedUI/Pages/User/ServiceProvider.razor b/TIAMSharedUI/Pages/User/ServiceProvider.razor
index 3ce5902a..a63e8369 100644
--- a/TIAMSharedUI/Pages/User/ServiceProvider.razor
+++ b/TIAMSharedUI/Pages/User/ServiceProvider.razor
@@ -32,14 +32,11 @@
                            ContextIds="@CompanyId"
                            Logger="_logger"
                            SignalRClient="AdminSignalRClient"
-                           AutoCollapseDetailRow="false"
-                           KeyboardNavigationEnabled="true"
                            CustomizeElement="Grid_CustomizeElement"
                            CustomizeEditModel="Grid_CustomizeEditModel"
                            EditMode="GridEditMode.EditForm"
                            ColumnResizeMode="GridColumnResizeMode.NextColumn"
-                           ShowFilterRow="true"
-                           KeyFieldName="Id">
+                           ShowFilterRow="true">
 
             <Columns>
                 <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
@@ -56,18 +53,18 @@
 
             </Columns>
             @* <DetailRowTemplate>
-            <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
+            <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" />
             </DetailRowTemplate> *@
             <DetailRowTemplate>
                 <DxTabs>
                     <DxTabPage Text="Profile">
-                        <ProfileGridComponent ParentData="((Company)myContext.DataItem)" KeyboardNavigationEnabled="true" />
+                        <ProfileGridComponent ParentData="((Company)myContext.DataItem)" />
                     </DxTabPage>
                     <DxTabPage Text="Products">
-                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsByOwnerId" ContextId="((Company)myContext.DataItem).Id" ParentData="((Company)myContext.DataItem)" KeyboardNavigationEnabled="true" />
+                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsByOwnerId" ContextId="((Company)myContext.DataItem).Id" ParentData="((Company)myContext.DataItem)" />
                     </DxTabPage>
                     <DxTabPage Text="Address">
-                        <AddressDetailGridComponent ParentData="((Company)myContext.DataItem).Profile" KeyboardNavigationEnabled="true" />
+                        <AddressDetailGridComponent ParentData="((Company)myContext.DataItem).Profile" />
                     </DxTabPage>
                 </DxTabs>
             </DetailRowTemplate>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
index e4726e65..9962f20d 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
@@ -29,11 +29,7 @@
                    OnGridEditModelSaving="DataItemSaving"
                    OnGridItemDeleting="DataItemDeleting"
                    OnGridItemChanged="DataItemChanged"
-                   KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                   KeyFieldName="Id"
                    ValidationEnabled="false"
-                   TextWrapEnabled="false"
-                   AutoExpandAllGroupRows="true"
                    EditMode="GridEditMode.EditForm"
                    ColumnResizeMode="GridColumnResizeMode.NextColumn"
                    DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
@@ -58,7 +54,6 @@
 </AddressDetailGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public IAcAddressRelation<Address> ParentData { get; set; } = null!;
     [Parameter] public IList<Address>? DataSource { get; set; }
     [Parameter] public EventCallback<Address> OnAddressChanged { get; set; }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
index f73a7ac8..e86b6c57 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
@@ -20,9 +20,6 @@
 
 <AddressGrid @ref="Grid" Data="_detailGridData"
         PageSize="5"
-        AutoExpandAllGroupRows="true"
-        KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-        KeyFieldName="Id"
         ValidationEnabled="false"
         CustomizeEditModel="CustomizeEditModel"        
         EditMode="GridEditMode.EditForm"
@@ -50,12 +47,8 @@
 </AddressGrid>
 
 @code {
-    [Parameter]
-    public bool KeyboardNavigationEnabled { get; set; }
-    [Parameter]
-    public object AddressContext { get; set; }
-    [Parameter]
-    public string ContextIdType { get; set; }
+    [Parameter]public object AddressContext { get; set; }
+    [Parameter]public string ContextIdType { get; set; }
     IGrid Grid { get; set; }
 
     List<TIAM.Entities.Addresses.Address> _detailGridData = new List<Address>();
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor
index 8327e80e..449320c1 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/CarDetailGridComponent.razor
@@ -23,9 +23,6 @@
                GetAllMessageTag="GetAllTag"
                SignalRClient="AdminSignalRClient"
                PageSize="10"
-               AutoExpandAllGroupRows="true"
-               KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-               KeyFieldName="Id"
                ValidationEnabled="false"
                CustomizeEditModel="CustomizeEditModel"
                EditMode="GridEditMode.EditForm"
@@ -54,7 +51,7 @@
             <DxTabs>
 
                 <DxTabPage Text="Driving permissions assigned">
-                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }" KeyboardNavigationEnabled="true"/>
+                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }" />
                 </DxTabPage>
 
             </DxTabs>
@@ -98,7 +95,6 @@
 
 @code {
     [Parameter] public Guid ContextId { get; set; }
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public ICarRelation ParentData { get; set; } = null!;
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllCars;
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
index d8c3c7c3..75dd745e 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor
@@ -22,9 +22,6 @@
          GetAllMessageTag="GetAllTag"
          SignalRClient="AdminSignalRClient"
          PageSize="10"
-         AutoExpandAllGroupRows="true"
-         KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-         KeyFieldName="Id"
          ValidationEnabled="false"
          CustomizeEditModel="CustomizeEditModel"
          EditMode="GridEditMode.EditForm"
@@ -53,7 +50,7 @@
             <DxTabs>
 
                 <DxTabPage Text="Driving permissions assigned">
-                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }" KeyboardNavigationEnabled="true"/>
+                    <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsById" ContextIds="new[] { ((Car)context.DataItem).UserProductMappingId }" />
                 </DxTabPage>
 
             </DxTabs>
@@ -95,7 +92,6 @@
 </CarGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public ICarRelation ParentData { get; set; } = null!;
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllCars;
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor
index 33cbad92..a3825a5d 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/CompaniesNestedUserProductMapping.razor
@@ -13,9 +13,6 @@
 </div>
 <DxGrid Data="_detailGridData"
         PageSize="5"
-        AutoExpandAllGroupRows="true"
-        KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-        KeyFieldName="Id"
         ValidationEnabled="false"
         CustomizeEditModel="CustomizeEditModel"
         EditModelSaving="EditModelSaving"
@@ -53,10 +50,7 @@
 </DxGrid>
 
 @code {
-    [Parameter]
-    public bool KeyboardNavigationEnabled { get; set; }
-    [Parameter]
-    public Company CurrentCompany { get; set; }
+    [Parameter]public Company CurrentCompany { get; set; }
 
     List<UserToCompany> _detailGridData;
 
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
index e83f15c0..d818974f 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/DriverGridComponent.razor
@@ -62,9 +62,6 @@
                         GetAllMessageTag="GetAllTag"
                         SignalRClient="AdminSignalRClient"
                         PageSize="10"
-                        AutoExpandAllGroupRows="true"
-                        KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                        KeyFieldName="Id"
                         ValidationEnabled="false"
                         CustomizeElement="Grid_CustomizeElement"
                         CustomizeEditModel="CustomizeEditModel"
@@ -91,10 +88,10 @@
                 <DxTabs>
 
                     <DxTabPage Text="Products">
-                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsById" ContextId="((UserProductMapping)context.DataItem).ProductId" KeyboardNavigationEnabled="true" />
+                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsById" ContextId="((UserProductMapping)context.DataItem).ProductId" />
                     </DxTabPage>
                     <DxTabPage Text="Cars">
-                        <CarDetailGridComponent GetAllTag="SignalRTags.GetCarsForUserProductMapping" ContextId="((UserProductMapping)context.DataItem).Id" KeyboardNavigationEnabled="true" />
+                        <CarDetailGridComponent GetAllTag="SignalRTags.GetCarsForUserProductMapping" ContextId="((UserProductMapping)context.DataItem).Id" />
                     </DxTabPage>
                 </DxTabs>
         }
@@ -130,7 +127,6 @@
 
 @code {
     [Parameter] public Guid ContextId { get; set; }
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public IProductRelation ParentData { get; set; } = null!;
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings;
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
index 77a379fb..a43ab4bd 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
@@ -60,7 +60,6 @@
 
     IGrid Grid { get; set; }
     //object? MasterGridData { get; set; }
-    bool AutoCollapseDetailRow { get; set; }
 
     public List<string> IgnoreList =
     [
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
index b687457b..b8ec745d 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
@@ -60,8 +60,6 @@
 
     IGrid Grid { get; set; }
     //object? MasterGridData { get; set; }
-    bool AutoCollapseDetailRow { get; set; }
-
 
     protected override async Task OnInitializedAsync()
     {
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index 8cc7d486..9ced0c36 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -87,14 +87,11 @@
                                  
                                  Logger="_logger"
                                  SignalRClient="AdminSignalRClient"
-                                 AutoCollapseDetailRow="_autoCollapseDetailRow"
-                                 KeyboardNavigationEnabled="true"
                                  CustomizeElement="Grid_CustomizeElement"
                                  CustomizeEditModel="Grid_CustomizeEditModel"
                                  EditMode="GridEditMode.EditForm"
                                  ColumnResizeMode="GridColumnResizeMode.NextColumn"
-                                 ShowFilterRow="true"
-                                 KeyFieldName="Id">
+                                 ShowFilterRow="true">
 
                         <Columns>
                             <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
@@ -126,18 +123,18 @@
 
                         </Columns>
                         @* <DetailRowTemplate>
-                        <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
+                        <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" />
                         </DetailRowTemplate> *@
                         <DetailRowTemplate>
                             <DxTabs ActiveTabIndexChanged="ActiveTabIndexChanged">
                                 <DxTabPage Text="Profile">
-                                    <ProfileGridComponent ParentData="((Company)context.DataItem)" KeyboardNavigationEnabled="true" />
+                                    <ProfileGridComponent ParentData="((Company)context.DataItem)" />
                                 </DxTabPage>
                                 <DxTabPage Text="Products">
-                                    <ProductDetailGridComponent @ref="_productDetailGridComponent" DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetProductsByOwnerId" OnGridEditModelSaving="OnProductGridItemSaving" ContextId="((Company)context.DataItem).Id" ParentData="(Company)context.DataItem" KeyboardNavigationEnabled="true" />
+                                    <ProductDetailGridComponent @ref="_productDetailGridComponent" DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetProductsByOwnerId" OnGridEditModelSaving="OnProductGridItemSaving" ContextId="((Company)context.DataItem).Id" ParentData="(Company)context.DataItem" />
                                 </DxTabPage>
                                 <DxTabPage Text="Address">
-                                    <AddressDetailGridComponent ParentData="((Company)context.DataItem).Profile" KeyboardNavigationEnabled="true" />
+                                    <AddressDetailGridComponent ParentData="((Company)context.DataItem).Profile" />
                                 </DxTabPage>
                             </DxTabs>
                         </DetailRowTemplate>
@@ -177,7 +174,6 @@
     private bool _setOwnerPopupVisible;
 
     private CompanyGrid _gridCompany;
-    private bool _autoCollapseDetailRow;
 
     private Company _companyToSetOwner = null;
 
@@ -351,16 +347,6 @@
             _gridCompany.ExpandDetailRow(0);
         }
     }
-    void AutoCollapseDetailRow_Changed(bool newValue)
-    {
-        _autoCollapseDetailRow = newValue;
-        if (!newValue) return;
-
-        _gridCompany.BeginUpdate();
-        _gridCompany.CollapseAllDetailRows();
-        _gridCompany.ExpandDetailRow(0);
-        _gridCompany.EndUpdate();
-    }
 
     private void ActiveTabIndexChanged(int index)
     {
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
index e2b40758..46cd6546 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
@@ -52,11 +52,7 @@
 
     bool PopupVisible { get; set; }
 
-    
-    bool AutoCollapseDetailRow { get; set; }
-
-    
-
+   
     void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
     {
         if (e.ElementType == GridElementType.DataRow && e.VisibleIndex % 2 == 1)
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index 331d7d18..9517bbcb 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -90,13 +90,10 @@
 
                                           CustomizeElement="Grid_CustomizeElement"
                                           CustomizeEditModel="Grid_CustomizeEditModel"
-                                          AutoCollapseDetailRow="_autoCollapseDetailRow"
-                                          KeyboardNavigationEnabled="true"
                                           EditMode="GridEditMode.EditForm"
                                           ColumnResizeMode="GridColumnResizeMode.NextColumn"
                                           AllowSelectRowByClick="false"
-                                          ShowFilterRow="true"
-                                          KeyFieldName="Id">
+                                          ShowFilterRow="true">
 
                                     <Columns>
                                         <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="AcDomain.IsDeveloperVersion" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
@@ -112,8 +109,6 @@
                                                 }
                                             </CellDisplayTemplate>
                                         </DxGridDataColumn>
-                                        <DxGridDataColumn FieldName="PaymentId" DisplayFormat="N"/>
-                                        <DxGridDataColumn Caption="Paid" FieldName="Paid" />
                                         <DxGridDataColumn FieldName="FromAddress"/>
                                         <DxGridDataColumn FieldName="ToAddress"/>
                                         <DxGridDataColumn FieldName="Appointment" DisplayFormat="g" Width="140" />
@@ -130,6 +125,8 @@
                                             </CellDisplayTemplate>
                                         </DxGridDataColumn>
                                         <DxGridDataColumn FieldName="PassengerCount"/>
+                                        <DxGridDataColumn FieldName="PaymentId" DisplayFormat="N" />
+                                        <DxGridDataColumn Caption="Paid" FieldName="Paid" />
                                         <DxGridDataColumn FieldName="TransferStatusType" SortIndex="0" SortOrder="GridColumnSortOrder.Ascending" SortMode="GridColumnSortMode.Value">
                                             <CellDisplayTemplate>
                                                 @{
@@ -144,10 +141,10 @@
                                     <DetailRowTemplate>
                                         <DxTabs>
                                             <DxTabPage Text="Messages">                                                
-                                                <MessageDetailGridComponent ContextId="((Transfer)context.DataItem).Id" KeyboardNavigationEnabled="true" />                                               
+                                                <MessageDetailGridComponent ContextId="((Transfer)context.DataItem).Id" />                                               
                                             </DxTabPage>
                                             <DxTabPage Text="Driver">
-                                                <TransferToDriverGridComponent ContextId="((Transfer)context.DataItem).Id" ParentData="(Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
+                                                <TransferToDriverGridComponent ContextId="((Transfer)context.DataItem).Id" ParentData="(Transfer)context.DataItem" />
                                             </DxTabPage>
                                         </DxTabs>
                                     </DetailRowTemplate>
@@ -235,7 +232,6 @@
     private LoggerClient<ManageTransfers> _logger;
 
     private bool _popupVisible;
-    private bool _autoCollapseDetailRow;
     private TransferGrid _gridTransfer;
     private DxTagBox<TransferStatusModel, TransferStatusModel> _filterTag;
 
@@ -489,15 +485,4 @@
             //_gridTransfer.ExpandDetailRow(0);
         }
     }
-
-    void AutoCollapseDetailRow_Changed(bool newValue)
-    {
-        _autoCollapseDetailRow = newValue;
-        if (!newValue) return;
-
-        _gridTransfer.BeginUpdate();
-        _gridTransfer.CollapseAllDetailRows();
-        _gridTransfer.ExpandDetailRow(0);
-        _gridTransfer.EndUpdate();
-    }
 }
\ No newline at end of file
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
index f5062278..1cf46d1b 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
@@ -60,7 +60,6 @@
 
     IGrid Grid { get; set; }
     //object? MasterGridData { get; set; }
-    bool AutoCollapseDetailRow { get; set; }
 
     public List<string> IgnoreList =
     [
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
index 62716782..89e11fda 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
@@ -65,16 +65,13 @@
 
                         <DxGrid @ref="Grid"
                                 Data="UserData"
-                                AutoCollapseDetailRow="AutoCollapseDetailRow"
-                                KeyboardNavigationEnabled="true"
                                 CustomizeElement="Grid_CustomizeElement"
                                 CustomizeEditModel="Grid_CustomizeEditModel"
                                 EditModelSaving="Grid_EditModelSaving"
                                 DataItemDeleting="Grid_DataItemDeleting"
                                 EditMode="GridEditMode.EditForm"
                                 ColumnResizeMode="GridColumnResizeMode.NextColumn"
-                                ShowFilterRow="true"
-                                KeyFieldName="Id">
+                                ShowFilterRow="true">
 
                             <Columns>
                                 <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
@@ -100,16 +97,16 @@
                             <DetailRowTemplate>
                                 <DxTabs>
                                     <DxTabPage Text="Profile">
-                                        <ProfileGridComponent ParentData="((UserModelDtoDetail)context.DataItem)" KeyboardNavigationEnabled="true" />
+                                        <ProfileGridComponent ParentData="((UserModelDtoDetail)context.DataItem)" />
                                     </DxTabPage>
                                     <DxTabPage Text="Address">
-                                        <AddressDetailGridComponent ParentData="((UserModelDtoDetail)context.DataItem).ProfileDto" KeyboardNavigationEnabled="true" />
+                                        <AddressDetailGridComponent ParentData="((UserModelDtoDetail)context.DataItem).ProfileDto" />
                                     </DxTabPage>
                                     <DxTabPage Text="Companies owned">
                                         <ServiceProviderGridComponent ContextId="((UserModelDtoDetail)context.DataItem).Id" />
                                     </DxTabPage>
                                     <DxTabPage Text="Roles in services">
-                                        <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsByUserId" ContextIds="new [] {((UserModelDtoDetail)context.DataItem).Id}" KeyboardNavigationEnabled="true" />
+                                        <UserProductMappingGridComponent GetAllTag="SignalRTags.GetUserProductMappingsByUserId" ContextIds="new [] {((UserModelDtoDetail)context.DataItem).Id}" />
                                     </DxTabPage>
                                 </DxTabs>
                                 
@@ -166,7 +163,6 @@
 
     IGrid Grid { get; set; }
     //object? MasterGridData { get; set; }
-    bool AutoCollapseDetailRow { get; set; }
 
     public List<string> IgnoreList =
     [
@@ -338,15 +334,4 @@
             Grid.ExpandDetailRow(0);
         }
     }
-    void AutoCollapseDetailRow_Changed(bool newValue)
-    {
-        AutoCollapseDetailRow = newValue;
-
-        if (!newValue) return;
-
-        Grid.BeginUpdate();
-        Grid.CollapseAllDetailRows();
-        Grid.ExpandDetailRow(0);
-        Grid.EndUpdate();
-    }
 }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
index 48da4ea1..d68a8750 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
@@ -26,9 +26,7 @@
                    Logger="_logger"
                    SignalRClient="AdminSignalRClient"
                    ContextIds="@(ContextId.IsNullOrEmpty() ? throw new InvalidDataException($"ContextId.IsNullOrEmpty(); ContextId: {ContextId}") : [ContextId.Value])"
-                   KeyFieldName="Id"
-                   CustomizeElement="CustomizeElement"
-                   TextWrapEnabled="false">
+                   CustomizeElement="CustomizeElement">
 
     <Columns>
         <DxGridCommandColumn Width="135" MinWidth="135" DeleteButtonVisible="AcDomain.IsDeveloperVersion" EditButtonVisible="AcDomain.IsDeveloperVersion" FixedPosition="GridColumnFixedPosition.Left" />
@@ -61,7 +59,6 @@
 </MessageDetailGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public Guid? ContextId { get; set; }
     //[Parameter] public IEmailMessageRelation ParentData { get; set; } = null!;
     [Parameter] public bool IsSubjectVisible { get; set; } = true;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor
index 7ba77bd3..53b98ef8 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor
@@ -25,9 +25,6 @@
              Logger="_logger"
                    SignalRClient="AdminSignalRClient"                   
                    PageSize="5"
-                   AutoExpandAllGroupRows="true"
-                   KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                   KeyFieldName="Id"
                    ValidationEnabled="false"
                    EditMode="GridEditMode.EditForm"
                    ColumnResizeMode="GridColumnResizeMode.NextColumn"
@@ -51,8 +48,6 @@
 </MessageGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
-
     private MessageGrid _messageGrid = null!;
     private LoggerClient<MessageGridComponent> _logger = null!;
 
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
index 410092d2..700ca7b2 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
@@ -32,9 +32,6 @@
                    OnGridEditModelSaving="DataItemSaving"
                    OnGridItemDeleting="DataItemDeleting"
                    OnGridItemChanged="DataItemChanged"
-                   TextWrapEnabled="false"
-                   KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                   KeyFieldName="Id"
                    ValidationEnabled="false"
                    EditMode="GridEditMode.EditForm"
                    ColumnResizeMode="GridColumnResizeMode.NextColumn"
@@ -56,7 +53,7 @@
                 </UserProductMappingGridComponent>
             </DxTabPage> 
             <DxTabPage Text="Profile">
-                <ProfileGridComponent ParentData="((Product)context.DataItem)" KeyboardNavigationEnabled="true" />
+                <ProfileGridComponent ParentData="((Product)context.DataItem)" />
             </DxTabPage>            
         </DxTabs>
     </DetailRowTemplate>
@@ -85,7 +82,6 @@
 </ProductDetailGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }    
     [Parameter] public Guid? ContextId { get; set; }
     [Parameter] public IProductsRelation? ParentData { get; set; } = null!;
     [Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor
index 4ef79978..5e90bc41 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor
@@ -28,9 +28,6 @@
                    OnGridEditModelSaving="DataItemSaving"
                    OnGridItemDeleting="DataItemDeleting"
                    OnGridItemChanged="DataItemChanged"
-                   TextWrapEnabled="false"
-                   KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                   KeyFieldName="Id"
                    ValidationEnabled="false"
                    EditMode="GridEditMode.EditForm"
                    ColumnResizeMode="GridColumnResizeMode.NextColumn"
@@ -49,14 +46,14 @@
     <DetailRowTemplate>
         <DxTabs>
             <DxTabPage Text="Prices">
-                <TransferDestinationToProductDetailGridComponent GetAllTag="SignalRTags.GetTransferDestinationToProductsByProductId" ContextIds="new [] {((Product)context.DataItem).Id}" KeyboardNavigationEnabled="true" />
+                <TransferDestinationToProductDetailGridComponent GetAllTag="SignalRTags.GetTransferDestinationToProductsByProductId" ContextIds="new [] {((Product)context.DataItem).Id}" />
             </DxTabPage>
             <DxTabPage Text="Permissions">
                 <UserProductMappingGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Never" ContextIds="new[] { ((Product)context.DataItem).Id }" GetAllTag="SignalRTags.GetUserProductMappingsByProductId">
                 </UserProductMappingGridComponent>
             </DxTabPage>
             <DxTabPage Text="Profile">
-                <ProfileGridComponent ParentData="((Product)context.DataItem)" KeyboardNavigationEnabled="true" />
+                <ProfileGridComponent ParentData="((Product)context.DataItem)" />
             </DxTabPage>
         </DxTabs>
     </DetailRowTemplate>
@@ -85,7 +82,6 @@
 </ProductGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }    
     
     [Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
index 1b54e0b5..f8293b8b 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
@@ -20,11 +20,7 @@
                    ContextIds="@(ParentData.ProfileId.IsNullOrEmpty() ? throw new InvalidDataException($"ParentData.ProfileId.IsNullOrEmpty(); ParentData.ProfileId: {ParentData.ProfileId}") : [ParentData.ProfileId])"
                    Logger="_logger"
                    SignalRClient="AdminSignalRClient"
-                   KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                   KeyFieldName="Id"
                    ValidationEnabled="false"
-                   TextWrapEnabled="false"
-                   AutoExpandAllGroupRows="true"
                    EditMode="GridEditMode.EditForm"
                    ColumnResizeMode="GridColumnResizeMode.NextColumn"
                    DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
@@ -39,7 +35,7 @@
     <DetailRowTemplate>
         <DxTabs>
             <DxTabPage Text="Address">
-                <AddressDetailGridComponent ParentData="((Profile)context.DataItem)" KeyboardNavigationEnabled="true" />
+                <AddressDetailGridComponent ParentData="((Profile)context.DataItem)" />
             </DxTabPage>
         </DxTabs>
     </DetailRowTemplate>
@@ -48,7 +44,6 @@
 
 @code {
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public IProfileForeignKey ParentData { get; set; } = null!;
 
     private ProfileDetailGrid _profileGrid = null!;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
index 416564c4..f6370d10 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
@@ -20,9 +20,6 @@
         SignalRClient="AdminSignalRClient"
         ContextIds="ContextIds"
         PageSize="5"
-        AutoExpandAllGroupRows="true"
-        KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-        KeyFieldName="Id"
         ValidationEnabled="false"       
         EditMode="GridEditMode.EditForm"
         ColumnResizeMode="GridColumnResizeMode.NextColumn"
@@ -39,7 +36,7 @@
 
         <DxTabs>
             <DxTabPage Text="Products">
-                <ProductDetailGridComponent ParentData="(Company)context.DataItem" ContextId="((Company)context.DataItem).Id" KeyboardNavigationEnabled="true" />
+                <ProductDetailGridComponent ParentData="(Company)context.DataItem" ContextId="((Company)context.DataItem).Id" />
             </DxTabPage>
             
         </DxTabs>
@@ -67,7 +64,6 @@
 </CompanyDetailGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public UserModelDtoDetail UserModelDtoDetail { get; set; }
     [Parameter] public Guid? ContextId { get; set; }
 
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor
index 23d33e45..62f31019 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor
@@ -23,12 +23,10 @@
                          SignalRClient="AdminSignalRClient"
                          PageSize="8"
                          GetAllMessageTag="GetAllTag"
-                         KeyFieldName="Id"
                          ValidationEnabled="false"
                          CustomizeEditModel="CustomizeEditModel"
                          EditMode="GridEditMode.EditForm"
                          ColumnResizeMode="GridColumnResizeMode.ColumnsContainer"
-                         KeyboardNavigationEnabled="true"
                          ShowFilterRow="true">
     <Columns>
         <DxGridCommandColumn Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
@@ -54,7 +52,7 @@
     <DetailRowTemplate>
         <DxTabs>
             <DxTabPage Text="Prices">
-                <TransferDestinationToProductDetailGridComponent GetAllTag="SignalRTags.GetTransferDestinationToProductsByTransferDestinationId" ContextIds="new [] {((TransferDestination)context.DataItem).Id}" KeyboardNavigationEnabled="true" />
+                <TransferDestinationToProductDetailGridComponent GetAllTag="SignalRTags.GetTransferDestinationToProductsByTransferDestinationId" ContextIds="new [] {((TransferDestination)context.DataItem).Id}" />
             </DxTabPage>            
         </DxTabs>
     </DetailRowTemplate>
@@ -94,7 +92,6 @@
 </TransferDestinationGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public Guid? ContextId { get; set; }
     [Parameter] public int GetAllTag { get; set; }
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
index cf8919b4..1a100aad 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor
@@ -22,8 +22,6 @@
     ContextIds="ContextIds"
     GetAllMessageTag="GetAllTag"
     PageSize="10"
-    KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-    KeyFieldName="Id"
     ValidationEnabled="false"       
     EditMode="GridEditMode.EditForm"
     ColumnResizeMode="GridColumnResizeMode.NextColumn">
@@ -47,7 +45,7 @@
 
         <DxTabs>
             <DxTabPage Text="Partner">
-                <ProductDetailGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetProductsById" ContextId="((TransferDestinationToProduct)context.DataItem).ProductId" ParentData="(Company)context.DataItem" KeyboardNavigationEnabled="true" />
+                <ProductDetailGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetProductsById" ContextId="((TransferDestinationToProduct)context.DataItem).ProductId" ParentData="(Company)context.DataItem" />
             </DxTabPage>
             
         </DxTabs>
@@ -81,7 +79,6 @@
 </TransferDestinationToProductDetailGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
     [Parameter] public Guid[]? ContextIds { get; set; } = null!;
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllTransferDestinationToProducts;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor
index dc093870..74a76004 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductGridComponent.razor
@@ -20,8 +20,6 @@
     Logger="_logger"
     SignalRClient="AdminSignalRClient"
     PageSize="10"
-    KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-    KeyFieldName="Id"
     ValidationEnabled="false"       
     EditMode="GridEditMode.EditForm"
     ColumnResizeMode="GridColumnResizeMode.NextColumn">
@@ -71,7 +69,6 @@
 </TransferDestinationToProductGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
 
     private LoggerClient<TransferDestinationToProductGridComponent> _logger = null!;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
index 6e9869ea..bf0121e7 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
@@ -11,6 +11,10 @@
 @using AyCode.Core.Enums
 @using AyCode.Core.Extensions
 @using AyCode.Core
+@using AyCode.Core.Helpers
+@using AyCode.Services.SignalRs
+@using TIAM.Entities.Users
+@using TIAM.Services
 @inject IUserDataService UserDataService
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject AdminSignalRClient AdminSignalRClient;
@@ -23,23 +27,31 @@
                              OnGridEditModelSaving="DataItemSaving"
                              OnGridItemDeleting="DataItemDeleting"
                              OnGridItemChanged="DataItemChanged"
-                             KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                             KeyFieldName="Id"
                              ValidationEnabled="false"
                              CustomizeEditModel="CustomizeEditModel"
                              EditMode="GridEditMode.EditRow"
                              ColumnResizeMode="GridColumnResizeMode.NextColumn">
     <Columns>
-        <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
-        <DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
-        <DxGridDataColumn FieldName="CarId" Width="40%" />
-        <DxGridDataColumn FieldName="LicencePlate" />
+        <DxGridCommandColumn Width="150" MinWidth="150" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridDataColumn FieldName="CarId" />
+        @*<DxGridDataColumn FieldName="CarId">
+            <EditSettings>
+                <DxComboBoxSettings Data="_cars" SearchMode="ListSearchMode.AutoSearch" Key
+                                    ValueFieldName="Id"
+                                    TextFieldName="LicencePlate" />
+            </EditSettings>
+        </DxGridDataColumn>*@
         <DxGridDataColumn FieldName="Price" />
+        <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
+        @{
+            var userEmailFieldName = $"{nameof(TransferToDriver.UserProductMapping)}.{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}";
+        }
+        <DxGridDataColumn FieldName="@userEmailFieldName" Caption="User email" SortIndex="0" ReadOnly="true" />
+        <DxGridDataColumn FieldName="LicencePlate" ReadOnly="true" />
     </Columns>
 </TransferToDriversDetailGrid>
 
 @code {
-    [Parameter] public bool KeyboardNavigationEnabled { get; set; }
     [Parameter] public Guid? ContextId { get; set; }
     [Parameter] public ITransferToDriversRelation ParentData { get; set; } = null!;
     [Parameter] public EventCallback<TransferToDriver> OnTransferToDriverChanged { get; set; }
@@ -47,11 +59,37 @@
     private TransferToDriversDetailGrid _transferToDriversGrid = null!;
     private LoggerClient<TransferToDriverGridComponent> _logger = null!;
 
-    protected override void OnInitialized()
+    private List<Car> _cars = [];
+
+    protected override async Task OnInitializedAsync()
     {
         _logger = new LoggerClient<TransferToDriverGridComponent>(LogWriters.ToArray());
 
         _logger.Info($"DetailGridData: {ParentData.TransferToDrivers.Count}");
+
+        //_cars.AddRange((await AdminSignalRClient.GetAllAsync<List<Car>>(SignalRTags.GetAllCars))!);
+
+        await base.OnInitializedAsync();
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            // _transferToDriversGrid.BeginUpdate();
+            // _cars.AddRange((await AdminSignalRClient.GetAllAsync<List<Car>>(SignalRTags.GetAllCars))!);
+            // _transferToDriversGrid.EndUpdate();
+
+            // AdminSignalRClient.GetAllAsync<List<Car>>(SignalRTags.GetAllCars, response =>
+            // {
+            //     if (response is { Status: SignalResponseStatus.Success, ResponseData: not null })
+            //         _cars.AddRange(response.ResponseData);
+
+            //     return Task.CompletedTask;
+            // }).Forget();
+        }
+
+        await base.OnAfterRenderAsync(firstRender);
     }
 
     private void DataItemChanged(GridDataItemChangedEventArgs<TransferToDriver> args)
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index db0de7f7..c4ef4f26 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -22,9 +22,6 @@
                         GetAllMessageTag="GetAllTag"
                         SignalRClient="AdminSignalRClient"
                         PageSize="10"
-                        AutoExpandAllGroupRows="true"
-                        KeyboardNavigationEnabled="KeyboardNavigationEnabled"
-                        KeyFieldName="Id"
                         ValidationEnabled="false"
                         CustomizeEditModel="CustomizeEditModel"
                         EditMode="GridEditMode.EditForm"
@@ -55,7 +52,7 @@
         @{
             <DxTabs>
                 <DxTabPage Text="Products">
-                    <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsById" ContextId="((UserProductMapping)context.DataItem).ProductId" KeyboardNavigationEnabled="true"/>
+                    <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsById" ContextId="((UserProductMapping)context.DataItem).ProductId" />
                 </DxTabPage>
             </DxTabs>
         }
@@ -82,9 +79,6 @@
 </UserProductMappingGrid>
 
 @code {
-    [Parameter]
-    public bool KeyboardNavigationEnabled { get; set; }
-
     [Parameter] public IProductRelation ParentData { get; set; } = null!;
 
     [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings;
diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
index 9f918536..1069bf6a 100644
--- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
+++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
@@ -230,6 +230,9 @@ namespace TIAMSharedUI.Shared.Components.Grids
         {
             if (!IsFirstInitializeParameters)
             {
+                //if (typeof(TDataItem) is IId<Guid> || typeof(TDataItem) is IId<int>)
+                KeyFieldName = "Id";
+
                 base.DataItemDeleting = EventCallback.Factory.Create<GridDataItemDeletingEventArgs>(this, OnItemDeleting);
                 base.EditModelSaving = EventCallback.Factory.Create<GridEditModelSavingEventArgs>(this, OnItemSaving);
 
@@ -243,6 +246,9 @@ namespace TIAMSharedUI.Shared.Components.Grids
                 TextWrapEnabled = false;
                 AllowSelectRowByClick = true;
                 HighlightRowOnHover = true;
+                AutoCollapseDetailRow = true;
+                AutoExpandAllGroupRows = false;
+                //KeyboardNavigationEnabled = true;
 
                 //var dataColumns = GetDataColumns();