diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index b64d3f67..b0e6eecf 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -150,22 +150,22 @@
                                             </DxTabPage>
                                         </DxTabs>
                                     </DetailRowTemplate>
-                                    <EditFormTemplate Context="EditFormContext">
+                                    <EditFormTemplate Context="editFormContext">
                                         @{
-                                            var transfer2 = (Transfer)EditFormContext.EditModel;
+                                            var transfer2 = (Transfer)editFormContext.EditModel;
                                         }
                                         <DxFormLayout CssClass="w-100">
                                             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.FirstName) ColSpanMd="6">
-                                                @EditFormContext.GetEditor("FirstName")
+                                                @editFormContext.GetEditor("FirstName")
                                             </DxFormLayoutItem>
                                             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.LastName) ColSpanMd="6">
-                                                @EditFormContext.GetEditor("LastName")
+                                                @editFormContext.GetEditor("LastName")
                                             </DxFormLayoutItem>
                                             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.DestinationAddress) ColSpanMd="6">
-                                                @EditFormContext.GetEditor("ToAddress")
+                                                @editFormContext.GetEditor("ToAddress")
                                             </DxFormLayoutItem>
                                             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.PickupAddress) ColSpanMd="6">
-                                                @EditFormContext.GetEditor("FromAddress")
+                                                @editFormContext.GetEditor("FromAddress")
                                             </DxFormLayoutItem>
                                             <DxFormLayoutItem Caption="Trip date:" ColSpanMd="6">
 
@@ -176,15 +176,15 @@
 
                                             </DxFormLayoutItem>
                                             <DxFormLayoutItem Caption="Passengers:" ColSpanMd="6">
-                                                @EditFormContext.GetEditor("PassengerCount")
+                                                @editFormContext.GetEditor("PassengerCount")
                                             </DxFormLayoutItem>
 
                                             <DxFormLayoutItem Caption="Paid:" ColSpanMd="6">
-                                                @EditFormContext.GetEditor("Payed")
+                                                @editFormContext.GetEditor("Payed")
                                             </DxFormLayoutItem>
 
                                             <DxFormLayoutItem Caption="Status:" ColSpanMd="6">
-                                                @EditFormContext.GetEditor("TransferStatusType")
+                                                @editFormContext.GetEditor("TransferStatusType")
                                             </DxFormLayoutItem>
 
                                         </DxFormLayout>
@@ -192,7 +192,7 @@
 
                                     <ToolbarTemplate>
                                         <div>
-                                            <DxTagBox Data="@Statuses" Values="@SelectedCategories"
+                                            <DxTagBox Data="@Statuses" Values="@SelectedCategories" @ref="_filterTag"
                                                       ValuesChanged="(IEnumerable<TransferStatusModel> values) => TagBox_ValuesChanged(values)"
                                                       ValueFieldName="StatusValue" TextFieldName="StatusName" NullText="Select category..."
                                                       ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" aria-label="Select category" />
@@ -231,24 +231,15 @@
 
 
 @code {
-
-    void TagBox_ValuesChanged(IEnumerable<TransferStatusModel> newSelectedCategories)
-    {
-        SelectedCategories = newSelectedCategories.ToList();
-        var filterCriteria = SelectedCategories.Any()
-            ? new InOperator("TransferStatusType", SelectedCategories.Select(c => c.StatusValue))
-            : null;
-
-        _gridTransfer.SetFieldFilterCriteria("TransferStatusType", filterCriteria);
-    }
-
     private LoggerClient<ManageTransfers> _logger;
 
     private bool _popupVisible;
     private bool _autoCollapseDetailRow;
     private TransferGrid _gridTransfer;
+    private DxTagBox<TransferStatusModel, TransferStatusModel> _filterTag;
 
-    List<TransferStatusModel> SelectedCategories { get; set; } = [];//[Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!];
+    List<TransferStatusModel> SelectedCategories { get; set; } 
+        = Statuses.Where(x => x.StatusValue != (byte)TransferStatusType.Finished && x.StatusValue != (byte)TransferStatusType.UserCanceled && x.StatusValue != (byte)TransferStatusType.AdminDenied).ToList();
 
     public List<string> IgnoreList =
     [
@@ -317,7 +308,7 @@
 
     public async Task SubmitForm(object result)
     {
-        var messageModel = result as MessageWizardModel;
+        var messageModel = (result as MessageWizardModel)!;
         messageModel.ContextId = _messageWizardModel.ContextId;
         //messageModel.SenderId = sessionService.User.UserId;
 
@@ -385,14 +376,29 @@
         transferEditModel.ContactEmail = "your@email.address";
     }
 
+    void TagBox_ValuesChanged(IEnumerable<TransferStatusModel> newSelectedCategories)
+    {
+        SelectedCategories = newSelectedCategories.ToList();
+        var filterCriteria = SelectedCategories.Any()
+            ? new InOperator("TransferStatusType", SelectedCategories.Select(c => c.StatusValue))
+            : null;
+
+        _gridTransfer.SetFieldFilterCriteria("TransferStatusType", filterCriteria);
+    }
+
     private void DataSourceChanged(IList<Transfer> transfers)
     {
         _logger.Info("DataSourceChanged called");
 
         InitializeAppointments(transfers);
 
-        // if(!SelectedCategories.Any())
-        //     SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!];
+        if (SelectedCategories.Count > 0)
+            TagBox_ValuesChanged(SelectedCategories);
+
+        if(!SelectedCategories.Any())
+            SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!];
+
+        
         
         // var filterTransferStatusType = Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!;
 
@@ -481,7 +487,7 @@
     {
         if (firstRender)
         {
-            _gridTransfer.ExpandDetailRow(0);
+            //_gridTransfer.ExpandDetailRow(0);
         }
     }