diff --git a/README.md b/README.md
index 198b8d67b..5fe079908 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Resources needed for one month of hot log storage.
 - For 500 data sources (1000 GB) of hot log storage you will need 32 Cores, 64 GB RAM, 1000 GB Disk Space
 - You may combine these tiers to allocate resources based on the number of devices and desired hot log storage retention
 
-IMPORTANT: Going above 500 data sources/devices requires adding slave nodes for horizontal scaling.
+IMPORTANT: Going above 500 data sources/devices requires adding secondary nodes for horizontal scaling.
 
 ## Installation steps
 The installation can be performed using an installer file or an [ISO image](https://utmstack.com/install). The instructions below are only for the installer file option; please skip them if you use the ISO image instead.
diff --git a/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html b/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html
index 9e057802e..9a7627a47 100644
--- a/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html
+++ b/frontend/src/app/app-module/guides/guide-azure/guide-azure.component.html
@@ -74,7 +74,7 @@ <h4 class="card-title mb-0 text-primary">
       <li>
         <p class="step-guide">
           <span class="step_number">6</span>
-          Get the <strong>"Storage Container Name"</strong> in: All services -> Storage account -> Your_Storage_Account
+          Get the <strong>"Storage Container Name"</strong> in: All services -> Storage accounts -> Your_Storage_Account
           -> Containers. It will be used to configure your tenant.
         </p>
         <img alt="Azure portal" class="step-img"
@@ -84,10 +84,8 @@ <h4 class="card-title mb-0 text-primary">
       <li>
         <p class="step-guide">
           <span class="step_number">7</span>
-          Get the <strong>Storage Account Connection string with key</strong> to access Azure <strong>"Storage
-          Account"</strong>.
-          Find the connection string here: Azure Portal -> Blob Storage account -> Access keys. It will be used to
-          configure your tenant.
+          Get the <strong>Storage Account Connection string with key</strong> to access Azure <strong>"Storage Account"</strong>.
+          Find the connection string here: All services -> Storage accounts -> Your_Storage_Account -> Access keys. It will be used to configure your tenant.
         </p>
 
         <img alt="Azure portal" class="step-img"
@@ -103,8 +101,8 @@ <h4 class="card-title mb-0 text-primary">
       <li>
         <p class="step-guide">
           <span class="step_number">8</span>
-          Configure your Azure Subscription to send log to the Event Hub. Go to Subscription and click on "Resource
-          providers". Search for "Event Grid", and make sure is registered in the "Resources providers".
+          Configure your Azure Subscription to send log to the Event Hub. Go to Subscription and click on <strong>"Resource
+          providers"</strong>. Search for <strong>"Event Grid"</strong>, and make sure is registered in the <strong>"Resources providers"</strong>.
         </p>
         <img alt="Azure portal" class="step-img"
              height="auto" src="../../../../assets/img/guides/azure/eventgrid.png"
@@ -113,7 +111,7 @@ <h4 class="card-title mb-0 text-primary">
       <li>
         <p class="step-guide">
           <span class="step_number">9</span>
-          Create a new Event by clicking in the "Events" -> "Event Subscription"
+          Create a new Event by clicking in the Events -> Event Subscription
         </p>
         <img alt="Azure portal" class="step-img"
              height="auto" src="../../../../assets/img/guides/azure/eventsubs.png"
@@ -122,7 +120,7 @@ <h4 class="card-title mb-0 text-primary">
       <li>
         <p class="step-guide">
           <span class="step_number">10</span>
-          Configure the "Event Subscription" to send logs to the Event Hub created previously.
+          Configure the <strong>"Event Subscription"</strong> to send logs to the Event Hub created previously.
         </p>
         <img alt="Azure portal" class="step-img"
              height="auto" src="../../../../assets/img/guides/azure/eventhubselection.png"
@@ -136,6 +134,7 @@ <h4 class="card-title mb-0 text-primary">
         </p>
         <ul class="mt-3 pl-3" style="list-style-type: circle !important;">
           <li>
+            The input field <strong>Event Hub Shared access policies - Connection string</strong> refers to Azure's
             <strong>Event Hub Shared Access Policies - Connection string-primary key: </strong> <u>Value obtained in step 3</u>
           </li>
           <li>
diff --git a/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss b/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss
index 9139a77c6..d5d200734 100644
--- a/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss
+++ b/frontend/src/app/compliance/shared/components/utm-compliance-schedule-create/utm-compliance-schedule-create.component.scss
@@ -53,3 +53,7 @@
   }
 
 }
+
+.utm-box {
+  z-index: auto!important;
+}
diff --git a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html
index e7ecc605c..7cd9ac161 100644
--- a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html
+++ b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.html
@@ -2,6 +2,7 @@
            [closeOnSelect]="true"
            [clearable]="filter.clearable"
            [items]="values"
+           [(ngModel)]="model"
            [loadingText]="filter.loadingText"
            [maxSelectedItems]="filter.maxSelectedItems"
            [multiple]="filter.multiple"
diff --git a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts
index 746c77fc4..b0438e2d2 100644
--- a/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts
+++ b/frontend/src/app/shared/components/utm/filters/dashboard-filter-view/dashboard-filter-select/dashboard-filter-select.component.ts
@@ -1,27 +1,38 @@
-import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core';
+import {Subject} from "rxjs";
+import {filter, takeUntil} from 'rxjs/operators';
 import {DashboardBehavior} from '../../../../../behaviors/dashboard.behavior';
 import {ElasticOperatorsEnum} from '../../../../../enums/elastic-operators.enum';
 import {ElasticSearchIndexService} from '../../../../../services/elasticsearch/elasticsearch-index.service';
 import {DashboardFilterType} from '../../../../../types/filter/dashboard-filter.type';
 import {ElasticFilterType} from '../../../../../types/filter/elastic-filter.type';
+import {ChangeFilterValueService} from '../../services/change-filter-value.service';
 
 @Component({
   selector: 'app-dashboard-filter-select',
   templateUrl: './dashboard-filter-select.component.html',
   styleUrls: ['./dashboard-filter-select.component.css']
 })
-export class DashboardFilterSelectComponent implements OnInit, OnChanges {
+export class DashboardFilterSelectComponent implements OnInit, OnChanges, OnDestroy {
   @Input() filter: DashboardFilterType;
   @Input() fullWidth = false;
   values: any[];
   isLoading = true;
+  model = null;
+  destroy$: Subject<void> = new Subject<void>();
 
   constructor(private elasticSearchIndexService: ElasticSearchIndexService,
+              private changeFilterValueService: ChangeFilterValueService,
               private dashboardBehavior: DashboardBehavior) {
   }
 
   ngOnInit() {
     this.getFieldValues();
+    this.changeFilterValueService.selectedValue$
+      .pipe(
+        takeUntil(this.destroy$),
+        filter(res => res && this.filter.field === res.field))
+      .subscribe(res => this.model = res.value);
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -30,7 +41,6 @@ export class DashboardFilterSelectComponent implements OnInit, OnChanges {
     }
   }
 
-
   getFieldValues() {
     const req = {
       page: 0,
@@ -43,7 +53,6 @@ export class DashboardFilterSelectComponent implements OnInit, OnChanges {
       this.values = res.body;
       this.isLoading = false;
     });
-
   }
 
   select($event: any, filter: DashboardFilterType) {
@@ -54,4 +63,9 @@ export class DashboardFilterSelectComponent implements OnInit, OnChanges {
     };
     this.dashboardBehavior.$filterDashboard.next({filter: [elasticFilter], indexPattern: filter.indexPattern});
   }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
 }
diff --git a/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts b/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts
index 40d3763d4..99e03e760 100644
--- a/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts
+++ b/frontend/src/app/shared/components/utm/filters/services/change-filter-value.service.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
   providedIn: 'root'
 })
 export class ChangeFilterValueService {
-  private selectedValueSubject = new BehaviorSubject<{ field: any, value: any }>(null);
+  private selectedValueSubject = new BehaviorSubject<{ field: any, value: any }>({field: undefined, value: undefined});
 
   selectedValue$: Observable<any> = this.selectedValueSubject.asObservable();