diff --git a/ProjectSBS/ProjectSBS.Windows/Package.appxmanifest b/ProjectSBS/ProjectSBS.Windows/Package.appxmanifest
index 7a606a3..8afa79e 100644
--- a/ProjectSBS/ProjectSBS.Windows/Package.appxmanifest
+++ b/ProjectSBS/ProjectSBS.Windows/Package.appxmanifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -12,7 +12,7 @@
   <Identity
     Name="3597CaffeStudios.Recurrents"
     Publisher="CN=A4324CBF-D4DD-41DE-9042-BB3AA1508016"
-    Version="0.9.30.0" />
+    Version="0.9.40.0" />
 
   <mp:PhoneIdentity PhoneProductId="b5323638-1e69-4644-a27d-9487a55d21ff" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 
diff --git a/ProjectSBS/ProjectSBS/App.cs b/ProjectSBS/ProjectSBS/App.cs
index 9689e07..510efdd 100644
--- a/ProjectSBS/ProjectSBS/App.cs
+++ b/ProjectSBS/ProjectSBS/App.cs
@@ -173,7 +173,9 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
         // Ensure the current window is active
         MainWindow.Activate();
 
-#if !HAS_UNO //&& !DEBUG
+#if !HAS_UNO && !DEBUG
+        AnalyticsService.Initialize();
+
         //TODO Always returns v1 on WinUI3
         //var version = Services?.GetRequiredService<IInteropService>().GetAppVersion();
 
diff --git a/ProjectSBS/ProjectSBS/Business/ViewModels/HomeViewModel.cs b/ProjectSBS/ProjectSBS/Business/ViewModels/HomeViewModel.cs
index 7c0634d..7e25e0b 100644
--- a/ProjectSBS/ProjectSBS/Business/ViewModels/HomeViewModel.cs
+++ b/ProjectSBS/ProjectSBS/Business/ViewModels/HomeViewModel.cs
@@ -242,6 +242,11 @@ private void AddNew()
     [RelayCommand]
     public async Task Archive(ItemViewModel? item = null)
     {
+        if (item is not { } && SelectedItem is not { })
+        {
+            return;
+        }
+
         ContentDialogResult result;
 
         if (!(item ?? SelectedItem).IsArchived)
@@ -260,17 +265,22 @@ public async Task Archive(ItemViewModel? item = null)
         {
             _itemService.ArchiveItem(item ?? SelectedItem);
 
-            SelectedItem = null;
-            RefreshItems();
-
             AnalyticsService.TrackEvent(AnalyticsService.ItemEvent, "Archived",
                 (item ?? SelectedItem).IsArchived.ToString());
+
+            SelectedItem = null;
+            RefreshItems();
         }
     }
 
     [RelayCommand]
     public async Task Delete(ItemViewModel? item = null)
     {
+        if (item is not { } && SelectedItem is not { })
+        {
+            return;
+        }
+
         var result = await _dialog.ShowAsync(
             _localizer["DeleteDialogTitle"],
             _localizer["DeleteDialogDescription"],
@@ -280,10 +290,10 @@ public async Task Delete(ItemViewModel? item = null)
         {
             _itemService.DeleteItem(item ?? SelectedItem);
 
+            AnalyticsService.TrackEvent(AnalyticsService.ItemEvent, "Deleted", "True");
+
             SelectedItem = null;
             RefreshItems();
-
-            AnalyticsService.TrackEvent(AnalyticsService.ItemEvent, "Deleted", "True");
         }
     }
 
diff --git a/ProjectSBS/ProjectSBS/Presentation/NestedPages/ArchivePage.xaml b/ProjectSBS/ProjectSBS/Presentation/NestedPages/ArchivePage.xaml
index 3202dbd..49134b8 100644
--- a/ProjectSBS/ProjectSBS/Presentation/NestedPages/ArchivePage.xaml
+++ b/ProjectSBS/ProjectSBS/Presentation/NestedPages/ArchivePage.xaml
@@ -156,7 +156,7 @@
                    MaxWidth="300"
                    Margin="20" />
 
-            <TextBlock Text="{cme:Localize Name=ArchiveEmptyTitle}"
+            <TextBlock Text="{cme:Localize Name=ItemsEmptyTitle}"
                        TextWrapping="WrapWholeWords"
                        HorizontalAlignment="Center"
                        FontWeight="Bold" />
diff --git a/ProjectSBS/ProjectSBS/Services/Analytics/AnalyticsService.cs b/ProjectSBS/ProjectSBS/Services/Analytics/AnalyticsService.cs
index be31932..dd4a2d0 100644
--- a/ProjectSBS/ProjectSBS/Services/Analytics/AnalyticsService.cs
+++ b/ProjectSBS/ProjectSBS/Services/Analytics/AnalyticsService.cs
@@ -10,7 +10,7 @@ public class AnalyticsService
     public const string LogIn = "02_LogIn";
     public const string ItemEvent = "03_ItemEvent";
 
-    public AnalyticsService()
+    public static void Initialize()
     {
 #if !HAS_UNO && !DEBUG
         AppCenter.Start(AppConfig.TelemetryId,