diff --git a/salesbook.Maui/Core/Services/ManageDataService.cs b/salesbook.Maui/Core/Services/ManageDataService.cs
index 103bbb2..faa35d8 100644
--- a/salesbook.Maui/Core/Services/ManageDataService.cs
+++ b/salesbook.Maui/Core/Services/ManageDataService.cs
@@ -175,9 +175,7 @@ public class ManageDataService(
 
     public async Task<List<ActivityDTO>> GetActivityTryLocalDb(WhereCondActivity whereCond)
     {
-        List<StbActivity>? activities;
-
-        activities = await localDb.Get<StbActivity>(x =>
+        var activities = await localDb.Get<StbActivity>(x =>
             (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
             (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
              x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
@@ -198,6 +196,7 @@ public class ManageDataService(
 
             _ = UpdateDb(activities);
         }
+        else return [];
 
         return await MapActivity(activities);
     }
@@ -219,16 +218,7 @@ public class ManageDataService(
 
             _ = UpdateDb(activities);
         }
-        else
-        {
-            activities = await localDb.Get<StbActivity>(x =>
-                (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
-                (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
-                 x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
-                (x.EffectiveTime >= whereCond.Start && x.EffectiveTime <= whereCond.End) ||
-                (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
-            );
-        }
+        else return await GetActivityTryLocalDb(whereCond);
 
         return await MapActivity(activities);
     }
diff --git a/salesbook.Maui/salesbook.Maui.csproj b/salesbook.Maui/salesbook.Maui.csproj
index 2b485a6..fd897fe 100644
--- a/salesbook.Maui/salesbook.Maui.csproj
+++ b/salesbook.Maui/salesbook.Maui.csproj
@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>2.1.0</ApplicationDisplayVersion>
-		<ApplicationVersion>17</ApplicationVersion>
+		<ApplicationDisplayVersion>2.1.1</ApplicationDisplayVersion>
+		<ApplicationVersion>18</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
diff --git a/salesbook.Shared/Components/Pages/Calendar.razor b/salesbook.Shared/Components/Pages/Calendar.razor
index a924445..e79e2cc 100644
--- a/salesbook.Shared/Components/Pages/Calendar.razor
+++ b/salesbook.Shared/Components/Pages/Calendar.razor
@@ -492,6 +492,8 @@
     // Selezione giorno in settimana
     private async Task SelezionaData(DateTime day)
     {
+        if (IsLoading) return;
+        
         SelectedDate = day;
 
         var cacheInternalMonth = _internalMonth;
@@ -513,6 +515,8 @@
     // Selezione giorno dal mese (chiude la vista mese!)
     private async Task SelezionaDataDalMese(DateTime day)
     {
+        if (IsLoading) return;
+        
         SelectedDate = day;
         SliderAnimation = "collapse-animation";
         Expanded = false;
diff --git a/salesbook.Shared/Components/Pages/Home.razor b/salesbook.Shared/Components/Pages/Home.razor
index 0df4d04..92849ac 100644
--- a/salesbook.Shared/Components/Pages/Home.razor
+++ b/salesbook.Shared/Components/Pages/Home.razor
@@ -15,12 +15,20 @@
 @inject PreloadService PreloadService
 @inject IMessenger Messenger
 
-<SpinnerLayout FullScreen="true" />
+<SpinnerLayout FullScreen="true"/>
 
 @code
 {
     protected override async Task OnInitializedAsync()
     {
+        var lastSyncDate = LocalStorage.Get<DateTime>("last-sync");
+        if (!FormFactor.IsWeb() && NetworkService.ConnectionAvailable && lastSyncDate.Equals(DateTime.MinValue))
+        {
+            var returnPath = System.Web.HttpUtility.UrlEncode("/");
+            NavigationManager.NavigateTo($"/sync?path={returnPath}");
+            return;
+        }
+
         NetworkService.ConnectionAvailable = NetworkService.IsNetworkAvailable();
 
         await LoadNotification();
@@ -35,14 +43,6 @@
             Console.WriteLine($"Firebase init: {e.Message}");
         }
 
-        var lastSyncDate = LocalStorage.Get<DateTime>("last-sync");
-
-        if (!FormFactor.IsWeb() && NetworkService.ConnectionAvailable && lastSyncDate.Equals(DateTime.MinValue))
-        {
-            NavigationManager.NavigateTo("/sync");
-            return;
-        }
-
         _ = StartSyncUser();
         NavigationManager.NavigateTo("/Calendar");
     }
@@ -60,9 +60,6 @@
 
     private Task StartSyncUser()
     {
-        return Task.Run(() =>
-        {
-            _ = PreloadService.PreloadUsersAsync();
-        });
+        return Task.Run(() => { _ = PreloadService.PreloadUsersAsync(); });
     }
 }
diff --git a/salesbook.Shared/Components/Pages/Users.razor b/salesbook.Shared/Components/Pages/Users.razor
index 610d3c7..ce31050 100644
--- a/salesbook.Shared/Components/Pages/Users.razor
+++ b/salesbook.Shared/Components/Pages/Users.razor
@@ -42,7 +42,7 @@
     {
         <SpinnerLayout FullScreen="false"/>
     }
-    else if (GroupedUserList?.Count > 0)
+    else if (GroupedUserList.IsNullOrEmpty() || FilteredGroupedUserList.IsNullOrEmpty())
     {
         <Virtualize OverscanCount="20" Items="FilteredGroupedUserList" Context="item">
             @if (item.ShowHeader)