diff --git a/salesbook.Maui/salesbook.Maui.csproj b/salesbook.Maui/salesbook.Maui.csproj
index fd897fe..8269499 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.1</ApplicationDisplayVersion>
-		<ApplicationVersion>18</ApplicationVersion>
+		<ApplicationDisplayVersion>2.1.2</ApplicationDisplayVersion>
+		<ApplicationVersion>19</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
diff --git a/salesbook.Shared/Components/Pages/Users.razor b/salesbook.Shared/Components/Pages/Users.razor
index ce31050..610d3c7 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.IsNullOrEmpty() || FilteredGroupedUserList.IsNullOrEmpty())
+    else if (GroupedUserList?.Count > 0)
     {
         <Virtualize OverscanCount="20" Items="FilteredGroupedUserList" Context="item">
             @if (item.ShowHeader)
diff --git a/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor b/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor
index 5512791..53675e0 100644
--- a/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor
+++ b/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor
@@ -479,8 +479,8 @@
         if (ActivityModel.CodAnag == null)
         {
             Commesse = await ManageData.GetTable<JtbComt>(x =>
-                x.CodJcom.Contains(searchValue, StringComparison.OrdinalIgnoreCase) ||
-                x.Descrizione.Contains(searchValue, StringComparison.OrdinalIgnoreCase)
+                x.CodJcom.ToUpper().Contains(searchValue.ToUpper()) ||
+                x.Descrizione.ToUpper().Contains(searchValue.ToUpper())
             );
         }
         else
@@ -544,11 +544,11 @@
         var results = new List<string>();
 
         results.AddRange(Clienti
-            .Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
+            .Where(x => (x.CodAnag != null && x.CodAnag.Contains(value, StringComparison.OrdinalIgnoreCase)) || x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
             .Select(x => $"{x.CodAnag} - {x.RagSoc}"));
 
         results.AddRange(Pros
-            .Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
+            .Where(x => (x.CodPpro != null && x.CodPpro.Contains(value, StringComparison.OrdinalIgnoreCase)) || x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
             .Select(x => $"{x.CodPpro} - {x.RagSoc}"));
 
         return Task.FromResult<IEnumerable<string>?>(results);
@@ -804,7 +804,7 @@
 
         VisibleOverlay = true;
         StateHasChanged();
-        
+
         _ = Task.Run(async () =>
         {
             var activityDescriptions = await IntegryApiService.SuggestActivityDescription(ActivityModel.ActivityTypeId);
@@ -813,7 +813,7 @@
 
             if (modal is { IsCanceled: false, Result: not null })
                 ActivityModel.ActivityDescription = modal.Result.Data!.ToString();
-            
+
             VisibleOverlay = false;
             await InvokeAsync(StateHasChanged);
         });