diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
index a51fd6e6d7..1dbb7fdc83 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
@@ -224,7 +224,7 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
   private copyCalculatedField(calculatedField: CalculatedField, isDirty = false): void {
     const copyCalculatedAlarmRule = deepClone(calculatedField);
     copyCalculatedAlarmRule.entityId = null;
-    this.getCalculatedAlarmDialog(calculatedField, 'action.apply', isDirty)
+    this.getCalculatedAlarmDialog(copyCalculatedAlarmRule, 'action.apply', isDirty)
       .subscribe((res) => {
         if (res) {
           this.updateData();
diff --git a/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profile-tabs.component.html b/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profile-tabs.component.html
index a9e9882ed9..ca7a6767e6 100644
--- a/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profile-tabs.component.html
+++ b/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profile-tabs.component.html
@@ -15,24 +15,20 @@
     limitations under the License.
 
 -->
-<mat-tab *ngIf="entity"
-         label="{{ 'attribute.attributes' | translate }}" #attributesTab="matTab">
-  <tb-attribute-table [defaultAttributeScope]="attributeScopes.SERVER_SCOPE"
-                      [active]="attributesTab.isActive"
-                      [entityId]="entity.id"
-                      [entityName]="entity.name">
-  </tb-attribute-table>
-</mat-tab>
-<mat-tab *ngIf="entity"
-         label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
-  <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
-                      disableAttributeScopeSelection
-                      [active]="telemetryTab.isActive"
-                      [entityId]="entity.id"
-                      [entityName]="entity.name">
-  </tb-attribute-table>
-</mat-tab>
-<mat-tab *ngIf="entity"
-         label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">
-  <tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table>
-</mat-tab>
+@if (entity) {
+  <mat-tab label="{{ 'attribute.attributes' | translate }}" #attributesTab="matTab">
+    <tb-attribute-table [defaultAttributeScope]="attributeScopes.SERVER_SCOPE"
+                        [active]="attributesTab.isActive"
+                        [entityId]="entity.id"
+                        [entityName]="entity.name">
+    </tb-attribute-table>
+  </mat-tab>
+  <mat-tab label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
+    <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
+                        disableAttributeScopeSelection
+                        [active]="telemetryTab.isActive"
+                        [entityId]="entity.id"
+                        [entityName]="entity.name">
+    </tb-attribute-table>
+  </mat-tab>
+}
diff --git a/ui-ngx/src/app/modules/home/pages/tenant/tenant-tabs.component.html b/ui-ngx/src/app/modules/home/pages/tenant/tenant-tabs.component.html
index b531e9bf87..464aaa301d 100644
--- a/ui-ngx/src/app/modules/home/pages/tenant/tenant-tabs.component.html
+++ b/ui-ngx/src/app/modules/home/pages/tenant/tenant-tabs.component.html
@@ -15,33 +15,27 @@
     limitations under the License.
 
 -->
-<mat-tab *ngIf="entity"
-         label="{{ 'attribute.attributes' | translate }}" #attributesTab="matTab">
-  <tb-attribute-table [defaultAttributeScope]="attributeScopes.SERVER_SCOPE"
-                      [active]="attributesTab.isActive"
-                      [entityId]="entity.id"
-                      [entityName]="entity.name">
-  </tb-attribute-table>
-</mat-tab>
-<mat-tab *ngIf="entity"
-         label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
-  <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
-                      disableAttributeScopeSelection
-                      [active]="telemetryTab.isActive"
-                      [entityId]="entity.id"
-                      [entityName]="entity.name">
-  </tb-attribute-table>
-</mat-tab>
-<mat-tab *ngIf="entity"
-         label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">
-  <tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table>
-</mat-tab>
-<mat-tab *ngIf="entity"
-         label="{{ 'tenant.events' | translate }}" #eventsTab="matTab">
-  <tb-event-table [defaultEventType]="eventTypes.ERROR" [active]="eventsTab.isActive" [tenantId]="nullUid"
-                  [entityId]="entity.id"></tb-event-table>
-</mat-tab>
-<mat-tab *ngIf="entity"
-         label="{{ 'relation.relations' | translate }}" #relationsTab="matTab">
-  <tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table>
-</mat-tab>
+@if (entity) {
+  <mat-tab label="{{ 'attribute.attributes' | translate }}" #attributesTab="matTab">
+    <tb-attribute-table [defaultAttributeScope]="attributeScopes.SERVER_SCOPE"
+                        [active]="attributesTab.isActive"
+                        [entityId]="entity.id"
+                        [entityName]="entity.name">
+    </tb-attribute-table>
+  </mat-tab>
+  <mat-tab label="{{ 'attribute.latest-telemetry' | translate }}" #telemetryTab="matTab">
+    <tb-attribute-table [defaultAttributeScope]="latestTelemetryTypes.LATEST_TELEMETRY"
+                        disableAttributeScopeSelection
+                        [active]="telemetryTab.isActive"
+                        [entityId]="entity.id"
+                        [entityName]="entity.name">
+    </tb-attribute-table>
+  </mat-tab>
+  <mat-tab label="{{ 'tenant.events' | translate }}" #eventsTab="matTab">
+    <tb-event-table [defaultEventType]="eventTypes.ERROR" [active]="eventsTab.isActive" [tenantId]="nullUid"
+                    [entityId]="entity.id"></tb-event-table>
+  </mat-tab>
+  <mat-tab label="{{ 'relation.relations' | translate }}" #relationsTab="matTab">
+    <tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table>
+  </mat-tab>
+}
diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
index 6621dbd878..bb44f0ea53 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts
@@ -299,7 +299,7 @@ export class EntitySubTypeListComponent implements ControlValueAccessor, OnInit,
   }
 
   selected(event: MatAutocompleteSelectedEvent): void {
-    this.add(event.option.viewValue);
+    this.add(event.option.value);
     this.clear('');
   }