diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java
index 8e62bd381a..1976f173a5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java
@@ -46,7 +46,6 @@ import org.thingsboard.server.dao.relation.RelationService;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index e397d071cc..888a9b9660 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -26,7 +26,6 @@ import { TranslateService } from '@ngx-translate/core';
 import { serverErrorCodesTranslations } from '@shared/models/constants';
 
 const varsRegex = /\${([^}]*)}/g;
-export const noLeadTrailSpacesRegex: RegExp = /^(?! )[\S\s]*(?<! )$/;
 
 export function onParentScrollOrWindowResize(el: Node): Observable<Event> {
   const scrollSubject = new Subject<Event>();
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts
index 70d68c93bd..391fa190fe 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts
@@ -51,7 +51,9 @@ import {
   JsonObjectEditDialogData
 } from '@shared/components/dialog/json-object-edit-dialog.component';
 import { jsonRequired } from '@shared/components/json-object-edit.component';
-import { deepClone, noLeadTrailSpacesRegex } from '@core/utils';
+import { deepClone } from '@core/utils';
+
+export const noLeadTrailSpacesRegex: RegExp = /^(?! )[\S\s]*(?<! )$/;
 
 @Component({
   selector: 'tb-gateway-service-rpc-connector',
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
index 851a469642..2a6bfaf853 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
@@ -22,9 +22,7 @@ import { DisplayColumnsPanelComponent } from '@home/components/widget/lib/displa
 import { AlarmsTableWidgetComponent } from '@home/components/widget/lib/alarm/alarms-table-widget.component';
 import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module';
 import { TimeseriesTableWidgetComponent } from '@home/components/widget/lib/timeseries-table-widget.component';
-import {
-  EntitiesHierarchyWidgetComponent
-} from '@home/components/widget/lib/entity/entities-hierarchy-widget.component';
+import { EntitiesHierarchyWidgetComponent } from '@home/components/widget/lib/entity/entities-hierarchy-widget.component';
 import { RpcWidgetsModule } from '@home/components/widget/lib/rpc/rpc-widgets.module';
 import {
   DateRangeNavigatorPanelComponent,
@@ -179,7 +177,7 @@ import {
         BarChartWithLabelsWidgetComponent
     ],
   providers: [
-    {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule}
+    {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule }
   ]
 })
 export class WidgetComponentsModule {
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 4e403033cb..6008cd00c4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -211,117 +211,117 @@
         "error-verification-url": "A domain name shouldn't contain symbols '/' and ':'. Example: thingsboard.io",
         "connection-settings": "Connection settings",
         "oauth2": {
-            "access-token-uri": "Access token URI",
-            "access-token-uri-required": "Access token URI is required.",
-            "activate-user": "Activate user",
-            "add-domain": "Add domain",
-            "delete-domain": "Delete domain",
-            "add-provider": "Add provider",
-            "delete-provider": "Delete provider",
-            "allow-user-creation": "Allow user creation",
-            "always-fullscreen": "Always fullscreen",
-            "authorization-uri": "Authorization URI",
-            "authorization-uri-required": "Authorization URI is required.",
-            "client-authentication-method": "Client authentication method",
-            "client-id": "Client ID",
-            "client-id-required": "Client ID is required.",
-            "client-id-max-length": "Client ID should be less than 256",
-            "client-secret": "Client secret",
-            "client-secret-required": "Client secret is required.",
-            "client-secret-max-length": "Client secret should be less than 2049",
-            "custom-setting": "Custom settings",
-            "customer-name-pattern": "Customer name pattern",
-            "customer-name-pattern-max-length": "Customer name pattern should be less than 256",
-            "default-dashboard-name": "Default dashboard name",
-            "default-dashboard-name-max-length": "Default dashboard name should be less than 256",
-            "delete-domain-text": "Be careful, after the confirmation a domain and all provider data will be unavailable.",
-            "delete-domain-title": "Are you sure you want to delete settings the domain '{{domainName}}'?",
-            "delete-registration-text": "Be careful, after the confirmation a provider data will be unavailable.",
-            "delete-registration-title": "Are you sure you want to delete the provider '{{name}}'?",
-            "email-attribute-key": "Email attribute key",
-            "email-attribute-key-required": "Email attribute key is required.",
-            "email-attribute-key-max-length": "Email attribute key should be less than 32",
-            "first-name-attribute-key": "First name attribute key",
-            "first-name-attribute-key-max-length": "First name attribute key should be less than 32",
-            "general": "General",
-            "jwk-set-uri": "JSON Web Key URI",
-            "last-name-attribute-key": "Last name attribute key",
-            "last-name-attribute-key-max-length": "Last name attribute key should be less than 32",
-            "login-button-icon": "Login button icon",
-            "login-button-label": "Provider label",
-            "login-button-label-placeholder": "Login with $(Provider label)",
-            "login-button-label-required": "Label is required.",
-            "login-provider": "Login provider",
-            "mapper": "Mapper",
-            "new-domain": "New domain",
-            "oauth2": "OAuth2",
-            "password-max-length": "Password should be less than 256",
-            "redirect-uri-template": "Redirect URI template",
-            "copy-redirect-uri": "Copy redirect URI",
-            "registration-id": "Registration ID",
-            "registration-id-required": "Registration ID is required.",
-            "registration-id-unique": "Registration ID need to unique for the system.",
-            "scope": "Scope",
-            "scope-required": "Scope is required.",
-            "tenant-name-pattern": "Tenant name pattern",
-            "tenant-name-pattern-required": "Tenant name pattern is required.",
-            "tenant-name-pattern-max-length": "Tenant name pattern ishould be less than 256",
-            "tenant-name-strategy": "Tenant name strategy",
-            "type": "Mapper type",
-            "uri-pattern-error": "Invalid URI format.",
-            "url": "URL",
-            "url-pattern": "Invalid URL format.",
-            "url-required": "URL is required.",
-            "url-max-length": "URL should be less than 256",
-            "user-info-uri": "User info URI",
-            "user-info-uri-required": "User info URI is required.",
-            "username-max-length": "User name should be less than 256",
-            "user-name-attribute-name": "User name attribute key",
-            "user-name-attribute-name-required": "User name attribute key is required",
-            "protocol": "Protocol",
-            "domain-schema-http": "HTTP",
-            "domain-schema-https": "HTTPS",
-            "domain-schema-mixed": "HTTP+HTTPS",
-            "enable": "Enable OAuth2 settings",
-            "domains": "Domains",
-            "mobile-apps": "Mobile applications",
-            "no-mobile-apps": "No applications configured",
-            "mobile-package": "Application package",
-            "mobile-package-placeholder": "Ex.: my.example.app",
-            "mobile-package-hint": "For Android: your own unique Application ID. For iOS: Product bundle identifier.",
-            "mobile-package-unique": "Application package must be unique.",
-            "mobile-app-secret": "Application secret",
-            "invalid-mobile-app-secret": "Application secret must contain only alphanumeric characters and must be between 16 and 2048 characters long.",
-            "copy-mobile-app-secret": "Copy application secret",
-            "add-mobile-app": "Add application",
-            "delete-mobile-app": "Delete application info",
-            "providers": "Providers",
-            "platform-web": "Web",
-            "platform-android": "Android",
-            "platform-ios": "iOS",
-            "all-platforms": "All platforms",
-            "smtp-provider": "SMTP provider",
-            "allowed-platforms": "Allowed platforms",
-            "authentication": "Authentication",
-            "basic": "Basic",
-            "provider": "Provider",
-            "redirect-url": "Redirect URI",
-            "domain-name": "Domain name",
-            "redirect-url-template": "Redirect URI template",
-            "microsoft-tenant-id": "Directory (tenant) Id",
-            "microsoft-tenant-id-required": "Directory (tenant) Id is required",
-            "token-uri": "Token URI",
-            "token-uri-required": "Token URI is required",
-            "redirect-uri": "Redirect URI",
-            "google-provider": "Google",
-            "microsoft-provider": "Office 365",
-            "sendgrid-provider": "Sendgrid",
-            "custom-provider": "Custom",
-            "generate-access-token": "Generate access token",
-            "update-access-token": "Update access token",
-            "access-token-status": "Access token status:",
-            "token-status-generated": "generated",
-            "token-status-not-generated": "not generated"
+          "access-token-uri": "Access token URI",
+          "access-token-uri-required": "Access token URI is required.",
+          "activate-user": "Activate user",
+          "add-domain": "Add domain",
+          "delete-domain": "Delete domain",
+          "add-provider": "Add provider",
+          "delete-provider": "Delete provider",
+          "allow-user-creation": "Allow user creation",
+          "always-fullscreen": "Always fullscreen",
+          "authorization-uri": "Authorization URI",
+          "authorization-uri-required": "Authorization URI is required.",
+          "client-authentication-method": "Client authentication method",
+          "client-id": "Client ID",
+          "client-id-required": "Client ID is required.",
+          "client-id-max-length": "Client ID should be less than 256",
+          "client-secret": "Client secret",
+          "client-secret-required": "Client secret is required.",
+          "client-secret-max-length": "Client secret should be less than 2049",
+          "custom-setting": "Custom settings",
+          "customer-name-pattern": "Customer name pattern",
+          "customer-name-pattern-max-length": "Customer name pattern should be less than 256",
+          "default-dashboard-name": "Default dashboard name",
+          "default-dashboard-name-max-length": "Default dashboard name should be less than 256",
+          "delete-domain-text": "Be careful, after the confirmation a domain and all provider data will be unavailable.",
+          "delete-domain-title": "Are you sure you want to delete settings the domain '{{domainName}}'?",
+          "delete-registration-text": "Be careful, after the confirmation a provider data will be unavailable.",
+          "delete-registration-title": "Are you sure you want to delete the provider '{{name}}'?",
+          "email-attribute-key": "Email attribute key",
+          "email-attribute-key-required": "Email attribute key is required.",
+          "email-attribute-key-max-length": "Email attribute key should be less than 32",
+          "first-name-attribute-key": "First name attribute key",
+          "first-name-attribute-key-max-length": "First name attribute key should be less than 32",
+          "general": "General",
+          "jwk-set-uri": "JSON Web Key URI",
+          "last-name-attribute-key": "Last name attribute key",
+          "last-name-attribute-key-max-length": "Last name attribute key should be less than 32",
+          "login-button-icon": "Login button icon",
+          "login-button-label": "Provider label",
+          "login-button-label-placeholder": "Login with $(Provider label)",
+          "login-button-label-required": "Label is required.",
+          "login-provider": "Login provider",
+          "mapper": "Mapper",
+          "new-domain": "New domain",
+          "oauth2": "OAuth2",
+          "password-max-length": "Password should be less than 256",
+          "redirect-uri-template": "Redirect URI template",
+          "copy-redirect-uri": "Copy redirect URI",
+          "registration-id": "Registration ID",
+          "registration-id-required": "Registration ID is required.",
+          "registration-id-unique": "Registration ID need to unique for the system.",
+          "scope": "Scope",
+          "scope-required": "Scope is required.",
+          "tenant-name-pattern": "Tenant name pattern",
+          "tenant-name-pattern-required": "Tenant name pattern is required.",
+          "tenant-name-pattern-max-length": "Tenant name pattern ishould be less than 256",
+          "tenant-name-strategy": "Tenant name strategy",
+          "type": "Mapper type",
+          "uri-pattern-error": "Invalid URI format.",
+          "url": "URL",
+          "url-pattern": "Invalid URL format.",
+          "url-required": "URL is required.",
+          "url-max-length": "URL should be less than 256",
+          "user-info-uri": "User info URI",
+          "user-info-uri-required": "User info URI is required.",
+          "username-max-length": "User name should be less than 256",
+          "user-name-attribute-name": "User name attribute key",
+          "user-name-attribute-name-required": "User name attribute key is required",
+          "protocol": "Protocol",
+          "domain-schema-http": "HTTP",
+          "domain-schema-https": "HTTPS",
+          "domain-schema-mixed": "HTTP+HTTPS",
+          "enable": "Enable OAuth2 settings",
+          "domains": "Domains",
+          "mobile-apps": "Mobile applications",
+          "no-mobile-apps": "No applications configured",
+          "mobile-package": "Application package",
+          "mobile-package-placeholder": "Ex.: my.example.app",
+          "mobile-package-hint": "For Android: your own unique Application ID. For iOS: Product bundle identifier.",
+          "mobile-package-unique": "Application package must be unique.",
+          "mobile-app-secret": "Application secret",
+          "invalid-mobile-app-secret": "Application secret must contain only alphanumeric characters and must be between 16 and 2048 characters long.",
+          "copy-mobile-app-secret": "Copy application secret",
+          "add-mobile-app": "Add application",
+          "delete-mobile-app": "Delete application info",
+          "providers": "Providers",
+          "platform-web": "Web",
+          "platform-android": "Android",
+          "platform-ios": "iOS",
+          "all-platforms": "All platforms",
+          "smtp-provider": "SMTP provider",
+          "allowed-platforms": "Allowed platforms",
+          "authentication": "Authentication",
+          "basic": "Basic",
+          "provider": "Provider",
+          "redirect-url": "Redirect URI",
+          "domain-name": "Domain name",
+          "redirect-url-template": "Redirect URI template",
+          "microsoft-tenant-id": "Directory (tenant) Id",
+          "microsoft-tenant-id-required": "Directory (tenant) Id is required",
+          "token-uri": "Token URI",
+          "token-uri-required": "Token URI is required",
+          "redirect-uri": "Redirect URI",
+          "google-provider": "Google",
+          "microsoft-provider": "Office 365",
+          "sendgrid-provider": "Sendgrid",
+          "custom-provider": "Custom",
+          "generate-access-token": "Generate access token",
+          "update-access-token": "Update access token",
+          "access-token-status": "Access token status:",
+          "token-status-generated": "generated",
+          "token-status-not-generated": "not generated"
         },
         "smpp-provider": {
             "smpp-version": "SMPP version",
@@ -418,7 +418,7 @@
         "no-auto-commit-entities-prompt": "No entities configured for auto-commit",
         "delete-auto-commit-settings-title": "Are you sure you want to delete auto-commit settings?",
         "delete-auto-commit-settings-text": "Be careful, after the confirmation the auto-commit settings will be removed and auto-commit will be disabled for all entities.",
-        "2fa": {
+        "2fa":  {
             "2fa": "Two-factor authentication",
             "available-providers": "Available providers",
             "issuer-name": "Issuer name",
@@ -479,7 +479,7 @@
         "slack-api-token": "Slack API token",
         "slack": "Slack",
         "slack-settings": "Slack settings"
-    },
+      },
     "alarm": {
         "alarm": "Alarm",
         "alarms": "Alarms",
@@ -590,7 +590,7 @@
         "oldest-first": "Oldest first",
         "newest-first": "Newest first",
         "activity": "Activity",
-        "export": "Export to CSV",
+        "export":  "Export to CSV",
         "author": "Author",
         "created-date": "Created date",
         "edited-date": "Edited date",
@@ -691,7 +691,7 @@
         "assign-assets": "Assign assets",
         "assign-assets-text": "Assign { count, plural, =1 {1 asset} other {# assets} } to customer",
         "assign-asset-to-edge-title": "Assign Asset(s) To Edge",
-        "assign-asset-to-edge-text": "Please select the assets to assign to the edge",
+        "assign-asset-to-edge-text":"Please select the assets to assign to the edge",
         "delete-assets": "Delete assets",
         "unassign-assets": "Unassign assets",
         "unassign-assets-action-title": "Unassign { count, plural, =1 {1 asset} other {# assets} } from customer",
@@ -1314,7 +1314,7 @@
         "assign-device-to-customer": "Assign Device(s) To Customer",
         "assign-device-to-customer-text": "Please select the devices to assign to the customer",
         "assign-device-to-edge-title": "Assign Device(s) To Edge",
-        "assign-device-to-edge-text": "Please select the devices to assign to the edge",
+        "assign-device-to-edge-text":"Please select the devices to assign to the edge",
         "make-public": "Make device public",
         "make-private": "Make device private",
         "no-devices-text": "No devices found",
@@ -1367,34 +1367,34 @@
         "generate-password": "Generate Password",
         "generate-access-token": "Generate Access Token",
         "lwm2m-security-config": {
-            "identity": "Client Identity",
-            "identity-required": "Client Identity is required.",
-            "identity-tooltip": "The PSK identifier is an arbitrary PSK identifier up to 128 bytes, as described in the standard [RFC7925].\nThe PSK identifier MUST first be converted to a character string and then encoded into octets using UTF-8.",
-            "client-key": "Client Key",
-            "client-key-required": "Client Key is required.",
-            "client-key-tooltip-prk": "RPK public key or id must be in the standard [RFC7250] and encoded to Base64 format!",
-            "client-key-tooltip-psk": "PSK key must be in the standard [RFC4279] and HexDec format: 32, 64, 128 characters!",
-            "endpoint": "Endpoint Client Name",
-            "endpoint-required": "Endpoint Client Name is required.",
-            "client-public-key": "Client public key",
-            "client-public-key-hint": "If client public key is empty, the trusted certificate will be used",
-            "client-public-key-tooltip": "X509 public key must be in DER-encoded X509v3 format and support exclusively EC algorithm and then encoded to Base64 format!",
-            "mode": "Security config mode",
-            "client-tab": "Client Security Config",
-            "client-certificate": "Client certificate",
-            "bootstrap-tab": "Bootstrap Client",
-            "bootstrap-server": "Bootstrap Server",
-            "lwm2m-server": "LwM2M Server",
-            "client-publicKey-or-id": "Client Public Key or Id",
-            "client-publicKey-or-id-required": "Client Public Key or Id is required.",
-            "client-publicKey-or-id-tooltip-psk": "The PSK identifier is an arbitrary PSK identifier up to 128 bytes, as described in the standard [RFC7925].\nThe PSK identifier MUST first be converted to a character string and then encoded into octets using UTF-8.",
-            "client-publicKey-or-id-tooltip-rpk": "RPK public key or id must be in the standard [RFC7250] and encoded to Base64 format!",
-            "client-publicKey-or-id-tooltip-x509": "X509 public key must be in DER-encoded X509v3 format and support exclusively EC algorithm and then encoded to Base64 format",
-            "client-secret-key": "Client Secret Key",
-            "client-secret-key-required": "Client Secret Key is required.",
-            "client-secret-key-tooltip-psk": "PSK key must be in the standard [RFC4279] and HexDec format: 32, 64, 128 characters!",
-            "client-secret-key-tooltip-prk": "RPK secret key must be in PKCS_8 format (DER encoding, standard [RFC5958]) and then encoded to Base64 format!",
-            "client-secret-key-tooltip-x509": "X509 secret key must be in PKCS_8 format (DER encoding, standard [RFC5958]) and then encoded to Base64 format!"
+          "identity": "Client Identity",
+          "identity-required": "Client Identity is required.",
+          "identity-tooltip": "The PSK identifier is an arbitrary PSK identifier up to 128 bytes, as described in the standard [RFC7925].\nThe PSK identifier MUST first be converted to a character string and then encoded into octets using UTF-8.",
+          "client-key": "Client Key",
+          "client-key-required": "Client Key is required.",
+          "client-key-tooltip-prk": "RPK public key or id must be in the standard [RFC7250] and encoded to Base64 format!",
+          "client-key-tooltip-psk": "PSK key must be in the standard [RFC4279] and HexDec format: 32, 64, 128 characters!",
+          "endpoint": "Endpoint Client Name",
+          "endpoint-required": "Endpoint Client Name is required.",
+          "client-public-key": "Client public key",
+          "client-public-key-hint": "If client public key is empty, the trusted certificate will be used",
+          "client-public-key-tooltip": "X509 public key must be in DER-encoded X509v3 format and support exclusively EC algorithm and then encoded to Base64 format!",
+          "mode": "Security config mode",
+          "client-tab": "Client Security Config",
+          "client-certificate": "Client certificate",
+          "bootstrap-tab": "Bootstrap Client",
+          "bootstrap-server": "Bootstrap Server",
+          "lwm2m-server": "LwM2M Server",
+          "client-publicKey-or-id": "Client Public Key or Id",
+          "client-publicKey-or-id-required": "Client Public Key or Id is required.",
+          "client-publicKey-or-id-tooltip-psk": "The PSK identifier is an arbitrary PSK identifier up to 128 bytes, as described in the standard [RFC7925].\nThe PSK identifier MUST first be converted to a character string and then encoded into octets using UTF-8.",
+          "client-publicKey-or-id-tooltip-rpk": "RPK public key or id must be in the standard [RFC7250] and encoded to Base64 format!",
+          "client-publicKey-or-id-tooltip-x509": "X509 public key must be in DER-encoded X509v3 format and support exclusively EC algorithm and then encoded to Base64 format",
+          "client-secret-key": "Client Secret Key",
+          "client-secret-key-required": "Client Secret Key is required.",
+          "client-secret-key-tooltip-psk": "PSK key must be in the standard [RFC4279] and HexDec format: 32, 64, 128 characters!",
+          "client-secret-key-tooltip-prk": "RPK secret key must be in PKCS_8 format (DER encoding, standard [RFC5958]) and then encoded to Base64 format!",
+          "client-secret-key-tooltip-x509": "X509 secret key must be in PKCS_8 format (DER encoding, standard [RFC5958]) and then encoded to Base64 format!"
         },
         "client-id": "Client ID",
         "client-id-pattern": "Contains invalid character.",
@@ -1714,13 +1714,13 @@
         "schedule-specific-time": "Active at a specific time",
         "schedule-custom": "Custom",
         "schedule-day": {
-            "monday": "Monday",
-            "tuesday": "Tuesday",
-            "wednesday": "Wednesday",
-            "thursday": "Thursday",
-            "friday": "Friday",
-            "saturday": "Saturday",
-            "sunday": "Sunday"
+          "monday": "Monday",
+          "tuesday": "Tuesday",
+          "wednesday": "Wednesday",
+          "thursday": "Thursday",
+          "friday": "Friday",
+          "saturday": "Saturday",
+          "sunday": "Sunday"
         },
         "schedule-days": "Days",
         "schedule-time": "Time",
@@ -2349,7 +2349,7 @@
         "make-private-entity-view-title": "Are you sure you want to make the entity view '{{entityViewName}}' private?",
         "make-private-entity-view-text": "After the confirmation the entity view and all its data will be made private and won't be accessible by others.",
         "assign-entity-view-to-edge": "Assign Entity View(s) To Edge",
-        "assign-entity-view-to-edge-text": "Please select the entity views to assign to the edge",
+        "assign-entity-view-to-edge-text":"Please select the entity views to assign to the edge",
         "unassign-entity-view-from-edge-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "After the confirmation the entity view will be unassigned and won't be accessible by the edge.",
         "unassign-entity-views-from-edge-action-title": "Unassign { count, plural, =1 {1 entity view} other {# entity views} } from edge",
@@ -2563,105 +2563,105 @@
         "invalid-file-error": "Invalid extension file"
     },
     "feature": {
-        "advanced-features": "Advanced features"
+         "advanced-features": "Advanced features"
     },
     "filter": {
-        "add": "Add filter",
-        "edit": "Edit filter",
-        "name": "Filter name",
-        "name-required": "Filter name is required.",
-        "duplicate-filter": "Filter with same name is already exists.",
-        "filters": "Filters",
-        "unable-delete-filter-title": "Unable to delete filter",
-        "unable-delete-filter-text": "Filter '{{filter}}' can't be deleted as it used by the following widget(s):<br/>{{widgetsList}}",
-        "duplicate-filter-error": "Duplicate filter found '{{filter}}'.<br>Filters must be unique within the dashboard.",
-        "missing-key-filters-error": "Key filters is missing for filter '{{filter}}'.",
-        "filter": "Filter",
-        "editable": "Editable",
-        "no-filters-found": "No filters found.",
-        "no-filter-text": "No filter specified",
-        "add-filter-prompt": "Please add filter",
-        "no-filter-matching": "'{{filter}}' not found.",
-        "create-new-filter": "Create a new one!",
-        "create-new": "Create new",
-        "filter-required": "Filter is required.",
-        "operation": {
-            "operation": "Operation",
-            "equal": "equal",
-            "not-equal": "not equal",
-            "starts-with": "starts with",
-            "ends-with": "ends with",
-            "contains": "contains",
-            "not-contains": "not contains",
-            "greater": "greater than",
-            "less": "less than",
-            "greater-or-equal": "greater or equal",
-            "less-or-equal": "less or equal",
-            "and": "and",
-            "or": "or",
-            "in": "in",
-            "not-in": "not in"
-        },
-        "ignore-case": "ignore case",
-        "value": "Value",
-        "remove-filter": "Remove filter",
-        "duplicate-filter-action": "Duplicate filter",
-        "preview": "Filter preview",
-        "no-filters": "No filters configured",
-        "add-filter": "Add filter",
-        "add-complex-filter": "Add complex filter",
-        "add-complex": "Add complex",
-        "complex-filter": "Complex filter",
-        "edit-complex-filter": "Edit complex filter",
-        "edit-filter-user-params": "Edit filter predicate user parameters",
-        "filter-user-params": "Filter predicate user parameters",
-        "user-parameters": "User parameters",
-        "display-label": "Label to display",
-        "autogenerated-label": "Auto generate label",
-        "order-priority": "Field order priority",
-        "key-filter": "Key filter",
-        "key-filters": "Key filters",
-        "key-name": "Key name",
-        "key-name-required": "Key name is required.",
-        "key-type": {
-            "key-type": "Key type",
-            "attribute": "Attribute",
-            "timeseries": "Timeseries",
-            "entity-field": "Entity field",
-            "constant": "Constant",
-            "client-attribute": "Client attribute",
-            "server-attribute": "Server attribute",
-            "shared-attribute": "Shared attribute"
-        },
-        "value-type": {
-            "value-type": "Value type",
-            "string": "String",
-            "numeric": "Numeric",
-            "boolean": "Boolean",
-            "date-time": "Datetime"
-        },
-        "value-type-required": "Key value type is required.",
-        "key-value-type-change-title": "Are you sure you want to change key value type?",
-        "key-value-type-change-message": "If you confirm new value type all entered key filters will be removed.",
-        "no-key-filters": "No key filters configured",
-        "add-key-filter": "Add key filter",
-        "remove-key-filter": "Remove key filter",
-        "edit-key-filter": "Edit key filter",
-        "date": "Date",
-        "time": "Time",
-        "current-tenant": "Current tenant",
-        "current-customer": "Current customer",
-        "current-user": "Current user",
-        "current-device": "Current device",
-        "default-value": "Default value",
-        "dynamic-source-type": "Dynamic source type",
-        "dynamic-value": "Dynamic value",
-        "no-dynamic-value": "No dynamic value",
-        "source-attribute": "Source attribute",
-        "switch-to-dynamic-value": "Switch to dynamic value",
-        "switch-to-default-value": "Switch to default value",
-        "inherit-owner": "Inherit from owner",
-        "source-attribute-not-set": "If source attribute isn't set"
+         "add": "Add filter",
+         "edit": "Edit filter",
+         "name": "Filter name",
+         "name-required": "Filter name is required.",
+         "duplicate-filter": "Filter with same name is already exists.",
+         "filters": "Filters",
+         "unable-delete-filter-title": "Unable to delete filter",
+         "unable-delete-filter-text": "Filter '{{filter}}' can't be deleted as it used by the following widget(s):<br/>{{widgetsList}}",
+         "duplicate-filter-error": "Duplicate filter found '{{filter}}'.<br>Filters must be unique within the dashboard.",
+         "missing-key-filters-error": "Key filters is missing for filter '{{filter}}'.",
+         "filter": "Filter",
+         "editable": "Editable",
+         "no-filters-found": "No filters found.",
+         "no-filter-text": "No filter specified",
+         "add-filter-prompt": "Please add filter",
+         "no-filter-matching": "'{{filter}}' not found.",
+         "create-new-filter": "Create a new one!",
+         "create-new": "Create new",
+         "filter-required": "Filter is required.",
+         "operation": {
+           "operation": "Operation",
+           "equal": "equal",
+           "not-equal": "not equal",
+           "starts-with": "starts with",
+           "ends-with": "ends with",
+           "contains": "contains",
+           "not-contains": "not contains",
+           "greater": "greater than",
+           "less": "less than",
+           "greater-or-equal": "greater or equal",
+           "less-or-equal": "less or equal",
+           "and": "and",
+           "or": "or",
+           "in": "in",
+           "not-in": "not in"
+         },
+         "ignore-case": "ignore case",
+         "value": "Value",
+         "remove-filter": "Remove filter",
+         "duplicate-filter-action": "Duplicate filter",
+         "preview": "Filter preview",
+         "no-filters": "No filters configured",
+         "add-filter": "Add filter",
+         "add-complex-filter": "Add complex filter",
+         "add-complex": "Add complex",
+         "complex-filter": "Complex filter",
+         "edit-complex-filter": "Edit complex filter",
+         "edit-filter-user-params": "Edit filter predicate user parameters",
+         "filter-user-params": "Filter predicate user parameters",
+         "user-parameters": "User parameters",
+         "display-label": "Label to display",
+         "autogenerated-label": "Auto generate label",
+         "order-priority": "Field order priority",
+         "key-filter": "Key filter",
+         "key-filters": "Key filters",
+         "key-name": "Key name",
+         "key-name-required": "Key name is required.",
+         "key-type": {
+           "key-type": "Key type",
+           "attribute": "Attribute",
+           "timeseries": "Timeseries",
+           "entity-field": "Entity field",
+           "constant": "Constant",
+           "client-attribute": "Client attribute",
+           "server-attribute": "Server attribute",
+           "shared-attribute": "Shared attribute"
+         },
+         "value-type": {
+           "value-type": "Value type",
+           "string": "String",
+           "numeric": "Numeric",
+           "boolean": "Boolean",
+           "date-time": "Datetime"
+         },
+         "value-type-required": "Key value type is required.",
+         "key-value-type-change-title": "Are you sure you want to change key value type?",
+         "key-value-type-change-message": "If you confirm new value type all entered key filters will be removed.",
+         "no-key-filters": "No key filters configured",
+         "add-key-filter": "Add key filter",
+         "remove-key-filter": "Remove key filter",
+         "edit-key-filter": "Edit key filter",
+         "date": "Date",
+         "time": "Time",
+         "current-tenant": "Current tenant",
+         "current-customer": "Current customer",
+         "current-user": "Current user",
+         "current-device": "Current device",
+         "default-value": "Default value",
+         "dynamic-source-type": "Dynamic source type",
+         "dynamic-value": "Dynamic value",
+         "no-dynamic-value": "No dynamic value",
+         "source-attribute": "Source attribute",
+         "switch-to-dynamic-value": "Switch to dynamic value",
+         "switch-to-default-value": "Switch to default value",
+         "inherit-owner": "Inherit from owner",
+         "source-attribute-not-set": "If source attribute isn't set"
     },
     "fullscreen": {
         "expand": "Expand to fullscreen",
@@ -3140,22 +3140,22 @@
             "access-token": "Access token",
             "x509": "X.509",
             "mqtt": {
-                "client-id": "MQTT client ID",
-                "user-name": "MQTT user name",
-                "password": "MQTT password"
+              "client-id": "MQTT client ID",
+              "user-name": "MQTT user name",
+              "password": "MQTT password"
             },
             "lwm2m": {
-                "client-endpoint": "LwM2M endpoint client name",
-                "security-config-mode": "LwM2M security config mode",
-                "client-identity": "LwM2M client identity",
-                "client-key": "LwM2M client key",
-                "client-cert": "LwM2M client public key",
-                "bootstrap-server-security-mode": "LwM2M bootstrap server security mode",
-                "bootstrap-server-secret-key": "LwM2M bootstrap server secret key",
-                "bootstrap-server-public-key-id": "LwM2M bootstrap server public key or id",
-                "lwm2m-server-security-mode": "LwM2M server security mode",
-                "lwm2m-server-secret-key": "LwM2M server secret key",
-                "lwm2m-server-public-key-id": "LwM2M server public key or id"
+              "client-endpoint": "LwM2M endpoint client name",
+              "security-config-mode": "LwM2M security config mode",
+              "client-identity": "LwM2M client identity",
+              "client-key": "LwM2M client key",
+              "client-cert": "LwM2M client public key",
+              "bootstrap-server-security-mode": "LwM2M bootstrap server security mode",
+              "bootstrap-server-secret-key": "LwM2M bootstrap server secret key",
+              "bootstrap-server-public-key-id": "LwM2M bootstrap server public key or id",
+              "lwm2m-server-security-mode": "LwM2M server security mode",
+              "lwm2m-server-secret-key": "LwM2M server secret key",
+              "lwm2m-server-public-key-id": "LwM2M server public key or id"
             },
             "snmp": {
                 "host": "SNMP host",
@@ -3169,7 +3169,7 @@
             "routing-key": "Edge key",
             "secret": "Edge secret"
         },
-        "stepper-text": {
+        "stepper-text":{
             "select-file": "Select a file",
             "configuration": "Import configuration",
             "column-type": "Select columns type",
@@ -3948,11 +3948,11 @@
         "queue-singleton-hint": "Select a queue for message forwarding in multi-instance environments. 'Main' queue is used by default."
     },
     "timezone": {
-        "timezone": "Timezone",
-        "select-timezone": "Select timezone",
-        "no-timezones-matching": "No timezones matching '{{timezone}}' were found.",
-        "timezone-required": "Timezone is required.",
-        "browser-time": "Browser Time"
+      "timezone": "Timezone",
+      "select-timezone": "Select timezone",
+      "no-timezones-matching": "No timezones matching '{{timezone}}' were found.",
+      "timezone-required": "Timezone is required.",
+      "browser-time": "Browser Time"
     },
     "queue": {
         "queue-name": "Queue",
@@ -3991,7 +3991,7 @@
         "delete-queue-text": "Be careful, after the confirmation the queue and all related data will become unrecoverable.",
         "delete-queues-text": "After the confirmation all selected queues will be deleted and won't be accessible.",
         "search": "Search queue",
-        "add": "Add queue",
+        "add" : "Add queue",
         "details": "Queue details",
         "topic": "Topic",
         "submit-settings": "Submit settings",
@@ -5094,16 +5094,16 @@
         "popover-style": "Popover style",
         "open-new-browser-tab": "Open in a new browser tab",
         "mobile": {
-            "action-type": "Mobile action type",
-            "action-type-required": "Mobile action type is required",
-            "take-picture-from-gallery": "Take picture from gallery",
-            "take-photo": "Take photo",
-            "map-direction": "Open map directions",
-            "map-location": "Open map location",
-            "scan-qr-code": "Scan QR Code",
-            "make-phone-call": "Make phone call",
-            "get-location": "Get phone location",
-            "take-screenshot": "Take screenshot"
+          "action-type": "Mobile action type",
+          "action-type-required": "Mobile action type is required",
+          "take-picture-from-gallery": "Take picture from gallery",
+          "take-photo": "Take photo",
+          "map-direction": "Open map directions",
+          "map-location": "Open map location",
+          "scan-qr-code": "Scan QR Code",
+          "make-phone-call": "Make phone call",
+          "get-location": "Get phone location",
+          "take-screenshot": "Take screenshot"
         }
     },
     "widgets-bundle": {
@@ -6780,7 +6780,7 @@
             "card-click": "On card click"
         }
     },
-    "paginator": {
+    "paginator" : {
         "items-per-page": "Items per page:",
         "first-page-label": "First page",
         "last-page-label": "Last page",