diff --git a/LiMan.UI/Components/CadCamSearchLic.razor b/LiMan.UI/Components/CadCamSearchLic.razor
index 38167a1..8b398e6 100644
--- a/LiMan.UI/Components/CadCamSearchLic.razor
+++ b/LiMan.UI/Components/CadCamSearchLic.razor
@@ -27,19 +27,55 @@
                 <table class="table table-sm table-striped table-responsive-lg">
                     <thead>
                         <tr>
-                            <th>Numero</th>
-                            <th>Seriale</th>
+                            <th>Prodotto</th>
+                            <th>Opzioni</th>
                             <th>Data</th>
                             <th>Note</th>
                         </tr>
                     </thead>
-                    <tbody>
+                    <tbody class="small">
                         @foreach (var item in ListRecords)
                         {
                             <tr>
-                                <td>@item.Number</td>
-                                <td>@item.Seriale</td>
-                                <td>@($"{item.Date:yyyy.MM.dd}")</td>
+                                <td>
+                                    <div class="d-flex justify-content-between small">
+                                        <div class="px-1">
+                                            ID: @item.ProductID
+                                        </div>
+                                        <div class="px-1">
+                                            Vers: @item.ProductVersion
+                                        </div>
+                                    </div>
+                                    <div class="d-flex justify-content-between small">
+                                        <div class="px-1">
+                                            Level: @item.ProductLevel
+                                        </div>
+                                        <div class="px-1">
+                                            D: @($"{item.ProductDeadline:yyyy.MM.dd}")
+                                        </div>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="d-flex justify-content-between small">
+                                        <div class="px-1">
+                                            Opz1: @item.Option1
+                                        </div>
+                                        <div class="px-1">
+                                            Opz2: @item.Option2
+                                        </div>
+                                    </div>
+                                    <div class="d-flex justify-content-between small">
+                                        <div class="px-1">
+                                            D: @($"{item.OptionDeadline:yyyy.MM.dd}")
+                                        </div>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div>
+                                        @($"{item.Date:yyyy.MM.dd}")
+                                    </div>
+                                    <sup>@item.LockID</sup>
+                                </td>
                                 <td>@item.Note</td>
                             </tr>
                         }
diff --git a/LiMan.UI/Components/CadCamSearchLic.razor.cs b/LiMan.UI/Components/CadCamSearchLic.razor.cs
index fcc284c..f8e77d4 100644
--- a/LiMan.UI/Components/CadCamSearchLic.razor.cs
+++ b/LiMan.UI/Components/CadCamSearchLic.razor.cs
@@ -26,15 +26,15 @@ namespace LiMan.UI.Components
 
         #region Private Properties
 
-        private List<KeyModel> AllRecords { get; set; } = new List<KeyModel>();
+        private List<LicenceModel> AllRecords { get; set; } = new List<LicenceModel>();
 
         private int currPage { get; set; } = 1;
 
         private bool isLoading { get; set; } = false;
 
-        private List<KeyModel> ListRecords { get; set; } = new List<KeyModel>();
+        private List<LicenceModel> ListRecords { get; set; } = new List<LicenceModel>();
         private int numRecord { get; set; } = 10;
-        private List<KeyModel> SearchRecords { get; set; } = new List<KeyModel>();
+        private List<LicenceModel> SearchRecords { get; set; } = new List<LicenceModel>();
         private int totalCount { get; set; } = 0;
 
         #endregion Private Properties
@@ -78,13 +78,13 @@ namespace LiMan.UI.Components
             {
                 SearchRecords = AllRecords
                                 .Where(x => (!string.IsNullOrEmpty(x.Note) && x.Note.Contains(searchVal, StringComparison.CurrentCultureIgnoreCase))
-                                || x.Number.ToString().Contains(searchVal, StringComparison.CurrentCultureIgnoreCase)
-                                || (!string.IsNullOrEmpty(x.Seriale) && x.Seriale.Contains(searchVal, StringComparison.CurrentCultureIgnoreCase)))
+                                || x.ProductVersion.ToString().Contains(searchVal, StringComparison.CurrentCultureIgnoreCase)
+                                || (!string.IsNullOrEmpty(x.Note) && x.Note.Contains(searchVal, StringComparison.CurrentCultureIgnoreCase)))
                                 .ToList();
             }
             else
             {
-                SearchRecords = new List<KeyModel>();
+                SearchRecords = new List<LicenceModel>();
             }
             totalCount = SearchRecords.Count;
             // paginazione!
@@ -98,7 +98,7 @@ namespace LiMan.UI.Components
         private async Task ReloadData()
         {
             isLoading = true;
-            AllRecords = await CCService.KeysGetAll();
+            AllRecords = await CCService.LicencesGetAll();
             isLoading = false;
         }
 
diff --git a/LiMan.UI/Components/SearchLicCadCam.razor b/LiMan.UI/Components/SearchLicCadCam.razor
index f21f299..5067a9d 100644
--- a/LiMan.UI/Components/SearchLicCadCam.razor
+++ b/LiMan.UI/Components/SearchLicCadCam.razor
@@ -14,12 +14,12 @@
     <div class="card-body">
         <div class="row">
             
-            <div class="col-6">
+            <div class="col-5">
                 <CadCamSearchKey searchVal="@searchVal"></CadCamSearchKey>
                 <br />
                 <CadCamSearchProd searchVal="@searchVal"></CadCamSearchProd>
             </div>
-            <div class="col-6">
+            <div class="col-7">
                 <CadCamSearchLic searchVal="@searchVal"></CadCamSearchLic>
             </div>
         </div>
diff --git a/LiMan.UI/Properties/PublishProfiles/IIS01.pubxml.user b/LiMan.UI/Properties/PublishProfiles/IIS01.pubxml.user
index 1df7f22..595f13e 100644
--- a/LiMan.UI/Properties/PublishProfiles/IIS01.pubxml.user
+++ b/LiMan.UI/Properties/PublishProfiles/IIS01.pubxml.user
@@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAAA7RC2yFYQ+sbph7Gm3hrEMAAAAAASAAACgAAAAEAAAAFhL9j1HkRjMaqEESfncpZcYAAAAIMz57CMDX9ZLAPLwms1/yHQTf/r/v74FFAAAAB6WaNF8er6HZmelU4da+AsQFSC5</EncryptedPassword>
-    <History>True|2024-07-12T13:23:56.6180961Z||;True|2021-11-15T12:33:33.2987951+01:00||;True|2021-11-15T12:33:27.3201015+01:00||;False|2021-11-15T12:32:40.3764636+01:00||;False|2021-11-15T12:32:23.7708013+01:00||;True|2021-11-08T16:54:51.5730510+01:00||;True|2021-11-08T16:54:38.6533172+01:00||;False|2021-11-08T16:54:25.9022390+01:00||;False|2021-11-08T16:37:09.0781792+01:00||;False|2021-11-08T16:37:00.0817797+01:00||;True|2021-10-21T12:25:14.7142511+02:00||;False|2021-10-21T12:24:42.4755537+02:00||;True|2021-10-21T12:21:40.3278003+02:00||;True|2021-10-21T12:20:53.0043613+02:00||;True|2021-10-21T12:20:40.4757156+02:00||;True|2021-10-21T08:46:30.7409630+02:00||;True|2021-10-21T08:46:23.7853777+02:00||;True|2021-10-15T11:33:23.1161895+02:00||;True|2021-10-15T11:26:37.7646366+02:00||;True|2021-10-15T11:26:08.9411561+02:00||;True|2021-10-15T11:25:36.6377010+02:00||;True|2021-10-15T11:25:15.7375383+02:00||;True|2021-10-15T11:20:26.4607123+02:00||;True|2021-10-15T11:13:33.8524245+02:00||;False|2021-10-15T10:30:42.4253422+02:00||;False|2021-10-15T10:27:43.8339493+02:00||;False|2021-10-15T10:23:05.0864739+02:00||;False|2021-10-15T10:22:43.2958457+02:00||;False|2021-10-15T10:22:15.0954116+02:00||;True|2021-10-15T10:15:10.5127570+02:00||;False|2021-10-15T10:13:53.0299219+02:00||;False|2021-10-15T08:58:38.3028788+02:00||;False|2021-10-15T08:47:48.5789826+02:00||;False|2021-10-14T19:32:56.5281204+02:00||;False|2021-10-14T19:31:10.1629370+02:00||;True|2021-05-26T19:49:30.0427896+02:00||;False|2021-05-26T19:49:14.9065510+02:00||;True|2021-05-25T17:48:33.3901785+02:00||;True|2021-05-25T17:46:09.2063020+02:00||;True|2021-05-25T17:42:47.8167539+02:00||;True|2021-05-25T17:22:03.1877438+02:00||;True|2021-05-25T17:21:05.1565775+02:00||;True|2021-05-25T16:26:34.1426996+02:00||;True|2021-05-25T16:14:28.2842402+02:00||;True|2021-05-25T15:02:11.7131495+02:00||;</History>
+    <History>True|2024-07-12T14:22:13.4098171Z||;True|2024-07-12T16:14:05.3015974+02:00||;True|2024-07-12T15:23:56.6180961+02:00||;True|2021-11-15T12:33:33.2987951+01:00||;True|2021-11-15T12:33:27.3201015+01:00||;False|2021-11-15T12:32:40.3764636+01:00||;False|2021-11-15T12:32:23.7708013+01:00||;True|2021-11-08T16:54:51.5730510+01:00||;True|2021-11-08T16:54:38.6533172+01:00||;False|2021-11-08T16:54:25.9022390+01:00||;False|2021-11-08T16:37:09.0781792+01:00||;False|2021-11-08T16:37:00.0817797+01:00||;True|2021-10-21T12:25:14.7142511+02:00||;False|2021-10-21T12:24:42.4755537+02:00||;True|2021-10-21T12:21:40.3278003+02:00||;True|2021-10-21T12:20:53.0043613+02:00||;True|2021-10-21T12:20:40.4757156+02:00||;True|2021-10-21T08:46:30.7409630+02:00||;True|2021-10-21T08:46:23.7853777+02:00||;True|2021-10-15T11:33:23.1161895+02:00||;True|2021-10-15T11:26:37.7646366+02:00||;True|2021-10-15T11:26:08.9411561+02:00||;True|2021-10-15T11:25:36.6377010+02:00||;True|2021-10-15T11:25:15.7375383+02:00||;True|2021-10-15T11:20:26.4607123+02:00||;True|2021-10-15T11:13:33.8524245+02:00||;False|2021-10-15T10:30:42.4253422+02:00||;False|2021-10-15T10:27:43.8339493+02:00||;False|2021-10-15T10:23:05.0864739+02:00||;False|2021-10-15T10:22:43.2958457+02:00||;False|2021-10-15T10:22:15.0954116+02:00||;True|2021-10-15T10:15:10.5127570+02:00||;False|2021-10-15T10:13:53.0299219+02:00||;False|2021-10-15T08:58:38.3028788+02:00||;False|2021-10-15T08:47:48.5789826+02:00||;False|2021-10-14T19:32:56.5281204+02:00||;False|2021-10-14T19:31:10.1629370+02:00||;True|2021-05-26T19:49:30.0427896+02:00||;False|2021-05-26T19:49:14.9065510+02:00||;True|2021-05-25T17:48:33.3901785+02:00||;True|2021-05-25T17:46:09.2063020+02:00||;True|2021-05-25T17:42:47.8167539+02:00||;True|2021-05-25T17:22:03.1877438+02:00||;True|2021-05-25T17:21:05.1565775+02:00||;True|2021-05-25T16:26:34.1426996+02:00||;True|2021-05-25T16:14:28.2842402+02:00||;True|2021-05-25T15:02:11.7131495+02:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Liman.CadCam/DbModel/LicenceModel.cs b/Liman.CadCam/DbModel/LicenceModel.cs
index e0f00f0..ea76612 100644
--- a/Liman.CadCam/DbModel/LicenceModel.cs
+++ b/Liman.CadCam/DbModel/LicenceModel.cs
@@ -26,23 +26,23 @@ namespace Liman.CadCam.DbModel
         public int ProductID { get; set; } = 0;
         public int ProductVersion { get; set; } = 0;
         public int ProductLevel { get; set; } = 0;
-        public DateTime ProductDeadline { get; set; } = DateTime.MinValue;
+        public DateTime? ProductDeadline { get; set; } = DateTime.MinValue;
 
         public int Option1 { get; set; } = 0;
         public int Option2 { get; set; } = 0;
-        public DateTime OptionDeadline { get; set; } = DateTime.MinValue;
+        public DateTime? OptionDeadline { get; set; } = DateTime.MinValue;
 
-        public string LockID { get; set; } = "";
-        public string File { get; set; } = "";
+        public string? LockID { get; set; } = "";
+        public string? File { get; set; } = "";
 
         /// <summary>
         /// Data creazione
         /// </summary>
         public DateTime Date { get; set; } = DateTime.MinValue;
-        public string LicFile { get; set; } = "";
-        public string Note { get; set; } = "";
-        public string NestKey { get; set; } = "";
-        public DateTime NestDeadline { get; set; } = DateTime.MinValue;
+        public string? LicFile { get; set; } = "";
+        public string? Note { get; set; } = "";
+        public string? NestKey { get; set; } = "";
+        public DateTime? NestDeadline { get; set; } = DateTime.MinValue;
 
 
         public override bool Equals(object? obj)