diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index dad84e29..ffb8d0d0 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step/Listeners/Database/SignalRDatabaseHandler.cs b/Step/Listeners/Database/SignalRDatabaseHandler.cs
index f3045c6e..dc702e79 100644
--- a/Step/Listeners/Database/SignalRDatabaseHandler.cs
+++ b/Step/Listeners/Database/SignalRDatabaseHandler.cs
@@ -101,6 +101,7 @@ namespace Step.Listeners.Database
                     Type = ALARM_TYPE.ERROR,
                     Processes = 0,
                     TimeStamp = x.DateTime,
+                    Source = ALARM_SOURCE.NC
                 }).ToList();
 
                 // Add processes alarms
@@ -110,9 +111,10 @@ namespace Step.Listeners.Database
                     Type = ALARM_TYPE.ERROR,
                     Processes = x.Process,
                     TimeStamp = x.DateTime,
+                    Source = ALARM_SOURCE.NC
                 }));
 
-                // Check if NC
+                // Check if there are NC alarms in order to insert their descriptions
                 if (alarmNewOccurrences.Count > 0)
                 {
                     // Add new voices
@@ -140,12 +142,14 @@ namespace Step.Listeners.Database
                 {
                     int processesByte = 0;
                     x.Process.ForEach(y => processesByte |= (1 << y));
+
                     return new AlarmOccurrencesModel()
                     {
                         AlarmDescriptionId = null,
                         Type = x.IsWarning ? ALARM_TYPE.WARNING : ALARM_TYPE.ERROR,
                         Processes = processesByte,
                         TimeStamp = x.DateTime,
+                        Source = ALARM_SOURCE.PLC
                     };
                 }));
 
diff --git a/Step/wwwroot/src/modules/axes-softkeys.vue b/Step/wwwroot/src/modules/axes-softkeys.vue
index ed52d1e9..731b078f 100644
--- a/Step/wwwroot/src/modules/axes-softkeys.vue
+++ b/Step/wwwroot/src/modules/axes-softkeys.vue
@@ -5,6 +5,7 @@
         <button class="soft icon axes"
                 @click="setAxes(a.id)"
                 v-for="a in axes"
+                v-if="a.isSelectable"
                 :key="a.id"
                 :disabled="isDisabled"
                 :class="{active: a.id == selectedAxisId}">{{a.name}}</button>