diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.html b/monitor-admin/manageStakeholders/manageStakeholders.component.html
index 74f005ff..cf96dbc3 100644
--- a/monitor-admin/manageStakeholders/manageStakeholders.component.html
+++ b/monitor-admin/manageStakeholders/manageStakeholders.component.html
@@ -1,156 +1,173 @@
 <div page-content>
-  <div header>
-    <sidebar-mobile-toggle class="uk-margin-top uk-hidden@m uk-display-block"></sidebar-mobile-toggle>
-    <div *ngIf="isCurator()" class="uk-margin-remove-bottom uk-margin-medium-top">
-      <slider-tabs [type]="'dynamic'" (activeEmitter)="tab = $event">
-        <slider-tab tabTitle="All" [tabId]="'all'" [active]="tab === 'all'"></slider-tab>
-        <slider-tab tabTitle="Profile templates" [tabId]="'templates'" [active]="tab === 'templates'"></slider-tab>
-        <slider-tab tabTitle="Profiles" [tabId]="'profiles'" [active]="tab === 'profiles'"></slider-tab>
-      </slider-tabs>
-    </div>
-  </div>
-  <div actions>
-    <div class="uk-section-xsmall">
-      <div class="uk-flex uk-flex-center uk-flex-wrap uk-flex-middle" [ngClass]="properties.dashboard == 'irish' ? 'uk-flex-between@m' : 'uk-flex-right@m'">
-        <div *ngIf="properties.dashboard == 'irish'" class="uk-width-medium uk-margin-small-bottom">
-          <div input type="select" placeholder="Type"
-            [options]="typeOptions" [formInput]="filters.get('type')">
-          </div>
+    <div header>
+        <sidebar-mobile-toggle class="uk-margin-top uk-hidden@m uk-display-block"></sidebar-mobile-toggle>
+        <div *ngIf="isCurator()" class="uk-margin-remove-bottom uk-margin-medium-top">
+            <slider-tabs [type]="'dynamic'" (activeEmitter)="tab = $event">
+                <slider-tab tabTitle="All" [tabId]="'all'" [active]="tab === 'all'"></slider-tab>
+                <slider-tab tabTitle="Profile templates" [tabId]="'templates'"
+                            [active]="tab === 'templates'"></slider-tab>
+                <slider-tab tabTitle="Profiles" [tabId]="'profiles'" [active]="tab === 'profiles'"></slider-tab>
+            </slider-tabs>
         </div>
-        <div search-input [searchControl]="filters.get('keyword')" [expandable]="true" placeholder="Search Profiles" searchInputClass="outer"
-             class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-right"></div>
-      </div>
     </div>
-  </div>
-  <div inner>
-    <div *ngIf="loading" class="uk-margin-medium-top uk-padding-large">
-      <loading></loading>
+    <div actions>
+        <div class="uk-section-xsmall">
+            <div class="uk-flex uk-flex-center uk-flex-wrap uk-flex-middle"
+                 [ngClass]="properties.dashboard == 'irish' ? 'uk-flex-between@m' : 'uk-flex-right@m'">
+                <div *ngIf="properties.dashboard == 'irish'" class="uk-width-medium uk-margin-small-bottom">
+                    <div input type="select" placeholder="Type"
+                         [options]="typeOptions" [formInput]="filters.get('type')">
+                    </div>
+                </div>
+                <div search-input [searchControl]="filters.get('keyword')" [expandable]="true"
+                     placeholder="Search Profiles" searchInputClass="outer"
+                     class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-right"></div>
+            </div>
+        </div>
     </div>
-    <div *ngIf="!loading" uk-height-match="target: .titleContainer; row: false">
-			<div uk-height-match="target: .logoContainer; row: false">
-				<div *ngIf="tab != 'profiles' && isCurator()" class="uk-section">
-					<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
-            <h4 class="uk-margin-remove">Profile Templates</h4>
-            <paging-no-load *ngIf="displayDefaultStakeholders.length > pageSize"
-              (pageChange)="updateCurrentTemplatesPage($event)"
-              [currentPage]="currentTemplatesPage" [size]="pageSize"
-              [totalResults]="displayDefaultStakeholders.length">
-            </paging-no-load>
-          </div>
-					<div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match" uk-grid>
-						<ng-template ngFor [ngForOf]="displayDefaultStakeholders.slice((currentTemplatesPage-1)*pageSize, currentTemplatesPage*pageSize)" let-stakeholder>
-							<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
-						</ng-template>
-						<div *ngIf="!loading && isCurator()">
-							<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new default profile.', isDefault:true}"></ng-container>
-						</div>
-					</div>
-				</div>
-				<div *ngIf="!isManager()" class="message">
-					<h4 class="uk-text-center">
-						No profiles to manage yet
-					</h4>
-				</div>
-				<div *ngIf="tab != 'templates' && isManager()" class="uk-section">
-					<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
-            <h4 class="uk-margin-remove">Profiles</h4>
-            <paging-no-load *ngIf="displayStakeholders.length > pageSize"
-              (pageChange)="updateCurrentPage($event)"
-              [currentPage]="currentPage" [size]="pageSize"
-              [totalResults]="displayStakeholders.length">
-            </paging-no-load>
-          </div>
-					<div class="uk-grid uk-grid-match uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1" uk-grid>
-						<ng-template ngFor [ngForOf]="displayStakeholders.slice((currentPage-1)*pageSize, currentPage*pageSize)" let-stakeholder>
-							<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
-						</ng-template>
-						<div *ngIf="!loading && isCurator()">
-							<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type ('+typesAsString+') and ' +
+    <div inner>
+        <div *ngIf="loading" class="uk-margin-medium-top uk-padding-large">
+            <loading></loading>
+        </div>
+        <div *ngIf="!loading" uk-height-match="target: .titleContainer; row: false">
+            <div uk-height-match="target: .logoContainer; row: false">
+                <div *ngIf="tab != 'profiles' && isCurator()" class="uk-section">
+                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
+                        <h4 class="uk-margin-remove">Profile Templates</h4>
+                        <paging-no-load *ngIf="displayDefaultStakeholders?.length > pageSize"
+                                        (pageChange)="updateCurrentTemplatesPage($event)"
+                                        [currentPage]="currentTemplatesPage" [size]="pageSize"
+                                        [totalResults]="displayDefaultStakeholders.length">
+                        </paging-no-load>
+                    </div>
+                    <div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match"
+                         uk-grid>
+                        <ng-template ngFor
+                                     [ngForOf]="displayDefaultStakeholders.slice((currentTemplatesPage-1)*pageSize, currentTemplatesPage*pageSize)"
+                                     let-stakeholder>
+                            <ng-container
+                                    *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
+                        </ng-template>
+                        <div *ngIf="!loading && isCurator()">
+                            <ng-container
+                                    *ngTemplateOutlet="newBox; context: {text:'Create a new default profile.', isDefault:true}"></ng-container>
+                        </div>
+                    </div>
+                </div>
+                <div *ngIf="!isManager()" class="message">
+                    <h4 class="uk-text-center">
+                        No profiles to manage yet
+                    </h4>
+                </div>
+                <div *ngIf="tab != 'templates' && isManager()" class="uk-section">
+                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
+                        <h4 class="uk-margin-remove">Profiles</h4>
+                        <paging-no-load *ngIf="displayStakeholders?.length > pageSize"
+                                        (pageChange)="updateCurrentPage($event)"
+                                        [currentPage]="currentPage" [size]="pageSize"
+                                        [totalResults]="displayStakeholders.length">
+                        </paging-no-load>
+                    </div>
+                    <div class="uk-grid uk-grid-match uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1"
+                         uk-grid>
+                        <ng-template ngFor
+                                     [ngForOf]="displayStakeholders.slice((currentPage-1)*pageSize, currentPage*pageSize)"
+                                     let-stakeholder>
+                            <ng-container
+                                    *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
+                        </ng-template>
+                        <div *ngIf="!loading && isCurator()">
+                            <ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type ('+typesAsString+') and ' +
 							'select indicators based on a default or a blank profile.', isDefault:false}"></ng-container>
-						</div>
-					</div>
-				</div>
-			</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 <ng-template #stakeholderBox let-stakeholder="stakeholder">
-  <div *ngIf="stakeholder">
-    <div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
-      <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
-        <a class="uk-link-reset uk-flex uk-flex-middle">
-          <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(stakeholder.visibility)" ratio="0.6"></icon>
-          <icon [flex]="true" name="more_vert"></icon>
-        </a>
-        <div #element class="uk-dropdown" uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
-          <ul class="uk-nav uk-dropdown-nav">
-            <li>
-              <a (click)="editStakeholder(stakeholder, !stakeholder.defaultId); hide(element)">Edit</a>
-            </li>
-            <li *ngIf="isCurator && stakeholderUtils.isCachingIndicators">
-              <a (click)="createReport(stakeholder);hide(element)">Cache Indicators</a>
-            </li>
-            <li *ngIf="showVisibility"  class="uk-nav-divider"></li>
-            <ng-template *ngIf="showVisibility" ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
-              <li [class.uk-active]="stakeholder.visibility === v.value">
-                <a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
-                  <div class="uk-flex uk-flex-middle">
-                    <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
-                    <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
-                    <icon *ngIf="stakeholder.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
-                  </div>
+    <div *ngIf="stakeholder">
+        <div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
+            <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
+                <a class="uk-link-reset uk-flex uk-flex-middle">
+                    <icon *ngIf="showVisibility" [flex]="true"
+                          [name]="stakeholderUtils.visibilityIcon.get(stakeholder.visibility)" ratio="0.6"></icon>
+                    <icon [flex]="true" name="more_vert"></icon>
                 </a>
-              </li>
-            </ng-template>
-            <hr *ngIf="isProfileManager(stakeholder)" class="uk-nav-divider">
-            <li *ngIf="isProfileManager(stakeholder)"><a
-                (click)="deleteStakeholderOpen(stakeholder);hide(element)">Delete</a>
-            </li>
-          </ul>
+                <div #element class="uk-dropdown"
+                     uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
+                    <ul class="uk-nav uk-dropdown-nav">
+                        <li>
+                            <a (click)="editStakeholder(stakeholder, !stakeholder.defaultId); hide(element)">Edit</a>
+                        </li>
+                        <li *ngIf="isCurator && stakeholderUtils.isCachingIndicators">
+                            <a (click)="createReport(stakeholder);hide(element)">Cache Indicators</a>
+                        </li>
+                        <li *ngIf="showVisibility" class="uk-nav-divider"></li>
+                        <ng-template *ngIf="showVisibility" ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
+                            <li [class.uk-active]="stakeholder.visibility === v.value">
+                                <a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
+                                    <div class="uk-flex uk-flex-middle">
+                                        <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
+                                        <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
+                                        <icon *ngIf="stakeholder.visibility === v.value" [flex]="true" name="done"
+                                              class="uk-text-secondary" ratio="0.8"></icon>
+                                    </div>
+                                </a>
+                            </li>
+                        </ng-template>
+                        <hr *ngIf="isProfileManager(stakeholder)" class="uk-nav-divider">
+                        <li *ngIf="isProfileManager(stakeholder)"><a
+                                (click)="deleteStakeholderOpen(stakeholder);hide(element)">Delete</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <a class="uk-display-block uk-text-center uk-link-reset" [routerLink]="'/admin/' + stakeholder.alias">
+                <div class="titleContainer uk-h6 uk-margin-remove-bottom uk-margin-top multi-line-ellipsis lines-2">
+                    <p *ngIf="stakeholder.name" class="uk-margin-remove">
+                        {{stakeholder.name}}
+                    </p>
+                </div>
+                <div class="logoContainer uk-margin-top uk-flex uk-flex-column uk-flex-center uk-flex-middle">
+                    <img [src]="stakeholder | logoUrl" class="uk-blend-multiply" style="max-height: 80px;">
+                </div>
+            </a>
         </div>
-      </div>
-      <a class="uk-display-block uk-text-center uk-link-reset" [routerLink]="'/admin/' + stakeholder.alias">
-        <div class="titleContainer uk-h6 uk-margin-remove-bottom uk-margin-top multi-line-ellipsis lines-2">
-					<p *ngIf="stakeholder.name" class="uk-margin-remove">
-						{{stakeholder.name}}
-					</p>
-				</div>
-        <div class="logoContainer uk-margin-top uk-flex uk-flex-column uk-flex-center uk-flex-middle">
-          <img [src]="stakeholder | logoUrl" class="uk-blend-multiply" style="max-height: 80px;">
-        </div>
-      </a>
     </div>
-  </div>
 </ng-template>
 <ng-template #newBox let-text="text" let-isDefault="isDefault">
-  <ng-container *ngIf="!loading">
-    <div class="uk-card uk-card-default uk-text-center uk-card-body clickable" (click)="editStakeholder(null, isDefault)">
-      <div class="uk-text-small uk-text-muted">
-        {{text}}
-      </div>
-      <div class="uk-margin-medium-top uk-margin-small-bottom">
+    <ng-container *ngIf="!loading">
+        <div class="uk-card uk-card-default uk-text-center uk-card-body clickable"
+             (click)="editStakeholder(null, isDefault)">
+            <div class="uk-text-small uk-text-muted">
+                {{text}}
+            </div>
+            <div class="uk-margin-medium-top uk-margin-small-bottom">
         <span class="uk-text-secondary">
           <icon name="add" [ratio]="3"></icon>
         </span>
-      </div>
-    </div>
-  </ng-container>
+            </div>
+        </div>
+    </ng-container>
 </ng-template>
 <modal-alert #editStakeholderModal [large]="true" classTitle="uk-background-primary uk-light"
-						(alertOutput)="editStakeholderComponent.save(callback)" (cancelOutput)="editStakeholderComponent.removePhoto()"
-						[okDisabled]="editStakeholderComponent.disabled">
-	<div class="uk-height-large uk-position-relative" *ngIf="editStakeholderComponent.loading">
-		<loading class="uk-position-center"></loading>
-	</div>
-	<div class="uk-padding" [class.uk-hidden]="editStakeholderComponent.loading">
-		<edit-stakeholder #editStakeholderComponent></edit-stakeholder>
-	</div>
+             (alertOutput)="editStakeholderComponent.save(callback)"
+             (cancelOutput)="editStakeholderComponent.removePhoto()"
+             [okDisabled]="editStakeholderComponent.disabled">
+    <div class="uk-height-large uk-position-relative" *ngIf="editStakeholderComponent.loading">
+        <loading class="uk-position-center"></loading>
+    </div>
+    <div class="uk-padding" [class.uk-hidden]="editStakeholderComponent.loading">
+        <edit-stakeholder #editStakeholderComponent></edit-stakeholder>
+    </div>
 </modal-alert>
 <modal-alert #deleteStakeholderModal [overflowBody]="false" (alertOutput)="deleteStakeholder()">
-	<div class="uk-height-medium uk-position-relative" *ngIf="deleteLoading">
-		<loading class="uk-position-center"></loading>
-	</div>
-	<div *ngIf="!deleteLoading">
-		This stakeholder will permanently be deleted. Are you sure you want to proceed?
-	</div>
+    <div class="uk-height-medium uk-position-relative" *ngIf="deleteLoading">
+        <loading class="uk-position-center"></loading>
+    </div>
+    <div *ngIf="!deleteLoading">
+        This stakeholder will permanently be deleted. Are you sure you want to proceed?
+    </div>
 </modal-alert>
diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.ts b/monitor-admin/manageStakeholders/manageStakeholders.component.ts
index e27967f3..22fd4ffe 100644
--- a/monitor-admin/manageStakeholders/manageStakeholders.component.ts
+++ b/monitor-admin/manageStakeholders/manageStakeholders.component.ts
@@ -40,8 +40,8 @@ export class ManageStakeholdersComponent extends StakeholderBaseComponent implem
   /**
    *  Filtered Stakeholders
    */
-  public displayDefaultStakeholders: Stakeholder[];
-  public displayStakeholders: Stakeholder[];
+  public displayDefaultStakeholders: Stakeholder[] = [];
+  public displayStakeholders: Stakeholder[] = [];
   /**
    * Top filters
    */
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index b94be019..f44fc7c5 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -1372,7 +1372,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
 
     let topic = this.stakeholder ? this.stakeholder.topics[this.topicIndex] : null;
     let category = topic ? topic.categories[this.categoryIndex] : null;
-    let subCategory = category ? category.subCategories[this.subcategoryIndex] : null;
+    let subCategory = category ? category.subCategories[subcategoryIndex] : null;
 
     var jsonFileUrl = window.URL.createObjectURL(new Blob([JSON.stringify(indicators)], {type: 'application/json'}));
     var a = window.document.createElement('a');
diff --git a/monitor-admin/utils/adminDashboard.guard.ts b/monitor-admin/utils/adminDashboard.guard.ts
index 3b366328..08d94461 100644
--- a/monitor-admin/utils/adminDashboard.guard.ts
+++ b/monitor-admin/utils/adminDashboard.guard.ts
@@ -8,7 +8,9 @@ import {StakeholderService} from "../../monitor/services/stakeholder.service";
 import {Observable, zip} from "rxjs";
 
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AdminDashboardGuard  {
 
   constructor(private router: Router,