diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
index edf1c33..b5d3c1a 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
@@ -1,4 +1,4 @@
-@page "/cms/tracks/{Id:int}"
+@page "/cms/tracks/{Id:long}"
 @using DeepDrftManager.Services
 @attribute [HierarchicalRoleAuthorize([SystemRoleConstants.Admin])]
 @inject ITrackService TrackService
@@ -89,7 +89,7 @@
 </MudContainer>
 
 @code {
-    [Parameter] public int Id { get; set; }
+    [Parameter] public long Id { get; set; }
 
     private TrackEntity? _track;
     private TrackEditForm _form = new();
diff --git a/DeepDrftManager/Components/_Imports.razor b/DeepDrftManager/Components/_Imports.razor
index cd6df25..8772000 100644
--- a/DeepDrftManager/Components/_Imports.razor
+++ b/DeepDrftManager/Components/_Imports.razor
@@ -16,4 +16,3 @@
 @using Models.Common
 @using AuthBlocksModels.SystemDefinitions
 @using AuthBlocksWeb.HierarchicalAuthorize
-@using AuthBlocksWeb.Services
diff --git a/DeepDrftManager/Services/CmsTrackService.cs b/DeepDrftManager/Services/CmsTrackService.cs
index 900709c..4013f24 100644
--- a/DeepDrftManager/Services/CmsTrackService.cs
+++ b/DeepDrftManager/Services/CmsTrackService.cs
@@ -142,17 +142,18 @@ public class CmsTrackService : ICmsTrackService
         var lookup = await _trackService.GetById(id);
         if (!lookup.Success)
         {
-            var error = lookup.Messages.FirstOrDefault()?.Message;
-            _logger.LogError("CMS delete: lookup failed for track {TrackId}: {Error}", id, error);
+            var error = lookup.Messages.FirstOrDefault()?.Message ?? "unknown error";
+            _logger.LogError("CMS delete: GetById threw for track {TrackId}: {Error}", id, error);
             return Result.CreateFailResult("Failed to load track.");
         }
 
-        var track = lookup.Value;
-        if (track is null)
+        if (lookup.Value is null)
         {
             return Result.CreateFailResult("Track not found.");
         }
 
+        var track = lookup.Value;
+
         var entryKey = track.EntryKey;
 
         // 2. SQL delete. On failure, do NOT touch the vault — nothing to clean up.