diff --git a/ui-ngx/src/app/core/http/calculated-fields.service.ts b/ui-ngx/src/app/core/http/calculated-fields.service.ts
index 8e7ab6795e..acaf3b2817 100644
--- a/ui-ngx/src/app/core/http/calculated-fields.service.ts
+++ b/ui-ngx/src/app/core/http/calculated-fields.service.ts
@@ -19,10 +19,10 @@ import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
 import { Observable } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { PageData } from '@shared/models/page/page-data';
-import { CalculatedField } from '@shared/models/calculated-field.models';
+import { CalculatedField, CalculatedFieldTestScriptInputParams } from '@shared/models/calculated-field.models';
 import { PageLink } from '@shared/models/page/page-link';
 import { EntityId } from '@shared/models/id/entity-id';
-import { TestScriptResult } from '@shared/models/rule-node.models';
+import { TestScriptResult } from '@shared/models/entity.models';
 
 @Injectable({
   providedIn: 'root'
@@ -50,7 +50,7 @@ export class CalculatedFieldsService {
       defaultHttpOptionsFromConfig(config));
   }
 
-  public testScript(inputParams: any, config?: RequestConfig): Observable<TestScriptResult> {
+  public testScript(inputParams: CalculatedFieldTestScriptInputParams, config?: RequestConfig): Observable<TestScriptResult> {
     return this.http.post<TestScriptResult>('/api/calculatedField/testScript', inputParams, defaultHttpOptionsFromConfig(config));
   }
 }
diff --git a/ui-ngx/src/app/core/http/rule-chain.service.ts b/ui-ngx/src/app/core/http/rule-chain.service.ts
index e3353989cc..c1333df1ac 100644
--- a/ui-ngx/src/app/core/http/rule-chain.service.ts
+++ b/ui-ngx/src/app/core/http/rule-chain.service.ts
@@ -35,7 +35,6 @@ import {
   RuleNodeConfiguration,
   ScriptLanguage,
   TestScriptInputParams,
-  TestScriptResult
 } from '@app/shared/models/rule-node.models';
 import { componentTypeBySelector, ResourcesService } from '../services/resources.service';
 import { catchError, map, mergeMap } from 'rxjs/operators';
@@ -44,6 +43,7 @@ import { deepClone, snakeCase } from '@core/utils';
 import { DebugRuleNodeEventBody } from '@app/shared/models/event.models';
 import { Edge } from '@shared/models/edge.models';
 import { IModulesMap } from '@modules/common/modules-map.models';
+import { TestScriptResult } from '@shared/models/entity.models';
 
 @Injectable({
   providedIn: 'root'
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 8c00cbc925..c71eef8de3 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
@@ -38,7 +38,8 @@ import { catchError, filter, switchMap } from 'rxjs/operators';
 import {
   CalculatedField,
   CalculatedFieldDebugDialogData,
-  CalculatedFieldDialogData, CalculatedFieldScriptTestDialogData
+  CalculatedFieldDialogData,
+  CalculatedFieldScriptTestDialogData
 } from '@shared/models/calculated-field.models';
 import {
   CalculatedFieldDebugDialogComponent,
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.scss
index 23aa4070d7..19bf072b11 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.scss
@@ -16,7 +16,6 @@
 :host {
   .debug-dialog-container {
     height: 77vh;
-    min-width: 80vw;
 
     .debug-dialog-content {
       border-radius: 0;
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 0613ccf1b7..20a37c8cc3 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
@@ -115,7 +115,10 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
         Object.fromEntries(Object.keys(this.configFormGroup.get('arguments').value).map(k => [k, ''])),
         this.configFormGroup.get('expressionSCRIPT').value,
         true
-    ).pipe(filter(Boolean)).subscribe((expression: string) => this.configFormGroup.get('expressionSCRIPT').setValue(expression));
+    ).pipe(filter(Boolean)).subscribe((expression: string) => {
+      this.configFormGroup.get('expressionSCRIPT').setValue(expression);
+      this.configFormGroup.get('expressionSCRIPT').markAsDirty();
+    });
   }
 
   private applyDialogData(): void {
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
index ecfe2d41aa..7af5e55b1c 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
@@ -48,10 +48,10 @@
         <div #rightPanel>
           <div #topRightPanel class="test-block-content">
             <div class="relative flex size-full min-w-96 gap-2">
-              <div class="absolute right-4 top-[6px] z-10 text-[12px] font-bold">
+              <div class="absolute right-2 top-[6px] z-10 text-[12px] font-bold">
                 <span class="block-label">{{ 'calculated-fields.arguments' | translate }}</span>
               </div>
-              <tb-calculated-field-test-arguments formControlName="arguments"/>
+              <tb-calculated-field-test-arguments class="size-full" formControlName="arguments"/>
             </div>
           </div>
           <div #bottomRightPanel class="test-block-content">
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
index 63ee6fc5a7..fa66827eb6 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
@@ -37,6 +37,7 @@ import { beautifyJs } from '@shared/models/beautify.models';
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { CalculatedFieldScriptTestDialogData } from '@shared/models/calculated-field.models';
+import { filter } from 'rxjs/operators';
 
 @Component({
   selector: 'tb-calculated-field-script-test-dialog',
@@ -71,10 +72,8 @@ export class CalculatedFieldScriptTestDialogComponent extends DialogComponent<Ca
               private destroyRef: DestroyRef,
               private calculatedFieldService: CalculatedFieldsService) {
     super(store, router, dialogRef);
-    beautifyJs(this.data.expression, {indent_size: 4}).pipe(takeUntilDestroyed()).subscribe(
-      (res) => {
-        this.calculatedFieldScriptTestFormGroup.get('expression').patchValue(res, {emitEvent: false});
-      }
+    beautifyJs(this.data.expression, {indent_size: 4}).pipe(filter(Boolean), takeUntilDestroyed()).subscribe(
+      (res) => this.calculatedFieldScriptTestFormGroup.get('expression').patchValue(res, {emitEvent: false})
     );
     this.calculatedFieldScriptTestFormGroup.get('arguments').patchValue(this.data.arguments, {emitEvent: false});
   }
diff --git a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
index c207e2d161..39fb143de0 100644
--- a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
@@ -360,7 +360,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
         this.columns[1].width = '20%';
         this.columns.push(
           new EntityTableColumn<Event>('entityId', 'event.entity-id', '85px',
-            (entity) => `<span style="display: inline-block; width: 7ch">${entity.body.entityId.substring(0, 6)}…</span>`,
+            (entity) => `<span style="display: inline-block; width: 7ch">${entity.body.entityId.substring(0, 8)}…</span>`,
             () => ({padding: '0 12px 0 0'}),
             false,
             () => ({padding: '0 12px 0 0'}),
@@ -380,7 +380,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
             }
           ),
           new EntityTableColumn<Event>('messageId', 'event.message-id', '85px',
-            (entity) => `<span style="display: inline-block; width: 7ch">${entity.body.msgId?.substring(0, 6)}…</span>`,
+            (entity) => `<span style="display: inline-block; width: 7ch">${entity.body.msgId?.substring(0, 8)}…</span>`,
             () => ({padding: '0 12px 0 0'}),
             false,
             () => ({padding: '0 12px 0 0'}),
@@ -462,9 +462,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
           name: this.translate.instant('common.test-with-this-message', {test: this.translate.instant(this.testButtonLabel)}),
           icon: 'bug_report',
           isEnabled: () => true,
-          onAction: (_, entity) => {
-            this.debugEventSelected.next(entity.body);
-          }
+          onAction: (_, entity) => this.debugEventSelected.next(entity.body)
         });
         break;
     }
diff --git a/ui-ngx/src/app/shared/models/calculated-field.models.ts b/ui-ngx/src/app/shared/models/calculated-field.models.ts
index e1f3ed8983..1a208e122f 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -148,10 +148,13 @@ export interface CalculatedFieldDebugDialogData {
   testScriptFn: CalculatedFieldTestScriptFn;
 }
 
-export interface CalculatedFieldScriptTestDialogData {
+export interface CalculatedFieldScriptTestDialogData extends CalculatedFieldTestScriptInputParams {
+  withApply: boolean;
+}
+
+export interface CalculatedFieldTestScriptInputParams {
   arguments: Record<string, unknown>,
   expression: string;
-  withApply: boolean;
 }
 
 export interface ArgumentEntityTypeParams {
diff --git a/ui-ngx/src/app/shared/models/entity.models.ts b/ui-ngx/src/app/shared/models/entity.models.ts
index 1f73c0c8eb..3a8c06f544 100644
--- a/ui-ngx/src/app/shared/models/entity.models.ts
+++ b/ui-ngx/src/app/shared/models/entity.models.ts
@@ -203,6 +203,11 @@ export interface EntityDebugSettings {
   allEnabledUntil?: number;
 }
 
+export interface TestScriptResult {
+  output: string;
+  error: string;
+}
+
 export interface AdditionalDebugActionConfig {
   action?: (id?: EntityId, ...restArguments: unknown[]) => void;
   title: string;
diff --git a/ui-ngx/src/app/shared/models/rule-node.models.ts b/ui-ngx/src/app/shared/models/rule-node.models.ts
index a79fdbc376..ac08fa38ac 100644
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
@@ -374,11 +374,6 @@ export interface TestScriptInputParams {
   msgType: string;
 }
 
-export interface TestScriptResult {
-  output: string;
-  error: string;
-}
-
 export enum MessageType {
   POST_ATTRIBUTES_REQUEST = 'POST_ATTRIBUTES_REQUEST',
   POST_TELEMETRY_REQUEST = 'POST_TELEMETRY_REQUEST',