diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
index 1b116d0696..ed936cd60e 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
@@ -61,6 +61,7 @@
           <tb-entity-select formControlName="entityId"
                             appearance="outline"
                             required
+                            entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                             [filterAllowedEntityTypes]="false"
                             [allowedEntityTypes]="alarmRuleEntityTypeList"
                             [defaultEntityType]="EntityType.DEVICE_PROFILE"
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
index 28695d9283..64f4ab652f 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
@@ -66,6 +66,7 @@
       <tb-entity-select formControlName="entityId"
                         appearance="outline"
                         required
+                        entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                         [filterAllowedEntityTypes]="false"
                         [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                         (entityChanged)="changeEntity($event)">
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
index 7cea16c636..7d4b4b7920 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
@@ -66,6 +66,7 @@
       <tb-entity-select formControlName="entityId"
                         appearance="outline"
                         required
+                        entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                         [filterAllowedEntityTypes]="false"
                         [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                         (entityChanged)="changeEntity($event)">
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index e5e4063c21..e09949d2c6 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -111,7 +111,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
       this.entityTabsComponent = CalculatedFieldsTabsComponent;
       this.rowPointer = true;
     }
-    this.tableTitle = this.pageMode ? '' : this.translate.instant('entity.type-calculated-fields');
+    this.tableTitle = this.translate.instant('entity.type-calculated-fields');
     this.detailsPanelEnabled = this.pageMode;
     this.entityType = EntityType.CALCULATED_FIELD;
     this.entityTranslations = entityTypeTranslations.get(EntityType.CALCULATED_FIELD);
@@ -253,7 +253,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
       });
   }
 
-  private getCalculatedFieldDialog(value?: CalculatedFieldsTableEntity, buttonTitle = 'action.add', isDirty = false): Observable<CalculatedField> {
+  private getCalculatedFieldDialog(value?: CalculatedFieldsTableEntity, buttonTitle = 'action.add', isDirty = false, disabledSelectType = false): Observable<CalculatedField> {
     const entityId = this.entityId || value?.entityId;
     const entityName = this.entityName || (value as CalculatedFieldInfo)?.entityName;
     return this.dialog.open<CalculatedFieldDialogComponent, CalculatedFieldDialogData, CalculatedField>(CalculatedFieldDialogComponent, {
@@ -269,6 +269,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         additionalDebugActionConfig: this.additionalDebugActionConfig,
         getTestScriptDialogFn: this.getTestScriptDialog.bind(this),
         isDirty,
+        disabledSelectType
       },
       enterAnimationDuration: isDirty ? 0 : null,
     })
@@ -344,7 +345,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
           }
           return of(calculatedField);
         }),
-        switchMap(calculatedField => this.getCalculatedFieldDialog(this.updateImportedCalculatedField(calculatedField), 'action.add', true)),
+        switchMap(calculatedField => this.getCalculatedFieldDialog(this.updateImportedCalculatedField(calculatedField), 'action.add', true, true)),
         filter(Boolean),
         switchMap(calculatedField => this.calculatedFieldsService.saveCalculatedField(calculatedField)),
         filter(Boolean),
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
index 38855ec79e..51d14c9478 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts
@@ -259,7 +259,11 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
         };
     }
     if (!onInit) {
-      this.argumentFormGroup.get('refEntityKey').get('key').setValue('');
+      this.argumentFormGroup.get('refEntityKey').get('key').setValue('', {emitEvents: !this.watchKeyChange});
+      if (this.watchKeyChange && this.argumentFormGroup.get('argumentName').pristine) {
+        this.argumentFormGroup.get('argumentName').markAsUntouched({emitEvent: false});
+        this.argumentFormGroup.get('argumentName').setValue('', {emitEvent: false});
+      }
     } else if (this.predefinedEntityFilter) {
       entityFilter = this.predefinedEntityFilter;
     }
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component.ts
index 983609dfa7..a05326699d 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component.ts
@@ -154,7 +154,7 @@ export class CalculatedFieldArgumentsTableComponent implements ControlValueAcces
 
   validate(): ValidationErrors | null {
     this.updateErrorText();
-    return this.errorText ? { argumentsFormArray: false } : null;
+    return this.errorText || !this.argumentsFormArray.controls.length ? { argumentsFormArray: false } : null;
   }
 
   setDisabledState(isDisabled: boolean): void {
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index 78df90701f..293dacdca6 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -59,6 +59,7 @@
           <tb-entity-select formControlName="entityId"
                             appearance="outline"
                             required
+                            entityTypeLabel="{{ 'entity.entity-type' | translate }}"
                             [filterAllowedEntityTypes]="false"
                             [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                             [defaultEntityType]="EntityType.DEVICE_PROFILE"
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
index 28a028eacc..ee38fb2a2d 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
@@ -50,6 +50,7 @@ export interface CalculatedFieldDialogData {
   additionalDebugActionConfig: AdditionalDebugActionConfig<(calculatedField: CalculatedField) => void>;
   getTestScriptDialogFn: CalculatedFieldTestScriptFn;
   isDirty?: boolean;
+  disabledSelectType?: boolean;
 }
 
 @Component({
@@ -106,10 +107,14 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
         }
       });
     }
+
+    if (this.data.disabledSelectType) {
+      this.fieldFormGroup.get('type').disable({emitEvent: false});
+    }
   }
 
   get fromGroupValue(): CalculatedField {
-    return deepTrim(this.fieldFormGroup.value as CalculatedField);
+    return deepTrim(this.fieldFormGroup.getRawValue() as CalculatedField);
   }
 
   cancel(): void {
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
index 9f4e331cc1..52c0226275 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
@@ -95,7 +95,9 @@
     <ng-container [formGroup]="refDynamicSourceFormGroup">
       <div class="tb-form-panel stroked" *ngIf="entityType === ArgumentEntityType.RelationQuery">
         <mat-expansion-panel class="tb-settings" expanded>
-          <mat-expansion-panel-header>{{ 'calculated-fields.entity-zone-relationship' | translate }}</mat-expansion-panel-header>
+          <mat-expansion-panel-header>
+            <span class="tb-form-panel-title tb-required">{{ 'calculated-fields.entity-zone-relationship' | translate }}</span>
+          </mat-expansion-panel-header>
           <div class="tb-form-table">
             <div class="tb-form-table-header">
               <div class="tb-form-table-header-cell tb-actions-header"></div>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-panel.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-panel.component.ts
index 3d5a53ea4e..811f7b87fa 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-panel.component.ts
@@ -74,7 +74,7 @@ export class CalculatedFieldMetricsPanelComponent implements OnInit {
 
   entityFilter: EntityFilter;
 
-  readonly AggFunctions = Object.values(AggFunction) as AggFunction[];
+  AggFunctions = Object.values(AggFunction) as AggFunction[];
   readonly AggFunctionTranslations = AggFunctionTranslations;
   readonly ScriptLanguage = ScriptLanguage;
   readonly AggInputType = AggInputType;
@@ -103,6 +103,10 @@ export class CalculatedFieldMetricsPanelComponent implements OnInit {
     this.validateInputKey();
 
     this.functionArgs = ['ctx', ...this.arguments];
+
+    if (this.simpleMode) {
+      this.AggFunctions = this.AggFunctions.filter(aggFunc => aggFunc !== AggFunction.COUNT_UNIQUE);
+    }
   }
 
   saveMetric(): void {
diff --git a/ui-ngx/src/app/shared/components/entity/entity-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-select.component.html
index 49e853e722..6ece6c0301 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-select.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-select.component.html
@@ -19,6 +19,7 @@
   <tb-entity-type-select
     *ngIf="displayEntityTypeSelect"
     class="flex-1"
+    [label]="entityTypeLabel ?? null"
     [appearance]="appearance"
     [showLabel]="true"
     [required]="required"
diff --git a/ui-ngx/src/app/shared/components/entity/entity-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-select.component.ts
index 57d2380705..f41a437ce4 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-select.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-select.component.ts
@@ -73,6 +73,9 @@ export class EntitySelectComponent implements ControlValueAccessor, OnInit {
   @Input()
   defaultEntityType: AliasEntityType | EntityType;
 
+  @Input()
+  entityTypeLabel: string;
+
   @Output()
   entityChanged = new EventEmitter<BaseData<EntityId>>();
 
diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
index fcfe158da0..dcabc49906 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
@@ -52,8 +52,16 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit,
   @coerceBoolean()
   showLabel: boolean;
 
+  private labelValue = this.translate.instant('entity.type');
+
+  get label(): string {
+    return this.labelValue;
+  }
+
   @Input()
-  label = this.translate.instant('entity.type');
+  set label(value: string) {
+    this.labelValue = value ?? this.translate.instant('entity.type');
+  }
 
   @Input()
   @coerceBoolean()
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 38f72b3206..259008791e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1183,7 +1183,7 @@
         "perimeter-attribute-key": "Perimeter attribute key",
         "perimeter-attribute-key-required": "Perimeter attribute key is required.",
         "perimeter-attribute-key-pattern": "Perimeter attribute key is invalid.",
-        "entity-zone-relationship": "Path from Entity to Zones *",
+        "entity-zone-relationship": "Path from Entity to Zones",
         "direction": "Relation direction",
         "direction-from": "From entity to zone",
         "direction-to": "From zone to entity",