diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts
index 1347116fd4..b5d0cc4d8d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.ts
@@ -208,7 +208,7 @@ export class MappingDialogComponent extends DialogComponent<MappingDialogCompone
           retain: [true, []]
         }),
         serverSideRpc: this.fb.group({
-          type: [ServerSideRPCType.ONE_WAY, []],
+          type: [ServerSideRPCType.TWO_WAY, []],
           deviceNameFilter: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
           methodFilter: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
           requestTopicExpression: ['', [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
@@ -218,7 +218,6 @@ export class MappingDialogComponent extends DialogComponent<MappingDialogCompone
           responseTimeout: [10000, [Validators.required]],
         })
       }));
-      this.mappingForm.patchValue(this.prepareFormValueData());
       this.mappingForm.get('requestType').valueChanges.pipe(
         startWith(this.mappingForm.get('requestType').value),
         takeUntil(this.destroy$)
@@ -246,6 +245,7 @@ export class MappingDialogComponent extends DialogComponent<MappingDialogCompone
           requestValueGroup.get('responseTimeout').enable({emitEvent: false});
         }
       });
+      this.mappingForm.patchValue(this.prepareFormValueData());
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
index 7e09a5bec0..cb8fa21230 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
@@ -614,7 +614,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
   }
 
   generate(formControlName: string): void {
-    this.connectorForm.get(formControlName).patchValue('tb_gw_' + generateSecret(5));
+    this.connectorForm.get(formControlName)?.patchValue('tb_gw_' + generateSecret(5));
   }
 
   private onDataUpdateError(e: any): void {
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 8c17ae6f50..c6b9e7e577 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3074,7 +3074,7 @@
         "statistics": {
             "statistic": "Statistic",
             "statistics": "Statistics",
-            "statistic-commands-empty": "No statistics available",
+            "statistic-commands-empty": "No configured statistic keys found. You can configure them in \"Statistics\" tab in general configuration.",
             "commands": "Commands",
             "send-period": "Statistic send period (in sec)",
             "send-period-required": "Statistic send period is required",
@@ -3219,7 +3219,10 @@
             "grpc-min-time-between-pings": "Minimum amount of time the server should wait between sending keepalive ping messages",
             "grpc-max-pings-without-data": "Maximum number of keepalive ping messages that the server can send without receiving any data before it considers the connection dead.",
             "grpc-min-ping-interval-without-data": "Minimum amount of time the server should wait between sending keepalive ping messages when there is no data being sent or received.",
-            "permit-without-calls": "Allow server to keep the GRPC connection alive even when there are no active RPC calls."
+            "permit-without-calls": "Allow server to keep the GRPC connection alive even when there are no active RPC calls.",
+            "memory": "Your data will be stored in the in-memory queue, it is a fastest but no persistence guarantee.",
+            "file": "Your data will be stored in separated files and will be saved even after the gateway restart.",
+            "sqlite": "Your data will be stored in file based database. And will be saved even after the gateway restart."
         }
     },
     "grid": {