diff --git a/libs/ui/src/lib/top-holdings/top-holdings.component.ts b/libs/ui/src/lib/top-holdings/top-holdings.component.ts
index 1a675a5531..80caca9185 100644
--- a/libs/ui/src/lib/top-holdings/top-holdings.component.ts
+++ b/libs/ui/src/lib/top-holdings/top-holdings.component.ts
@@ -38,11 +38,11 @@ import { GfValueComponent } from '../value/value.component';
   templateUrl: './top-holdings.component.html'
 })
 export class GfTopHoldingsComponent implements OnChanges {
-  @Input() baseCurrency: string;
-  @Input() hasPermissionToShowValues = true;
-  @Input() locale = getLocale();
-  @Input() pageSize = Number.MAX_SAFE_INTEGER;
-  @Input() topHoldings: HoldingWithParents[];
+  @Input() public baseCurrency?: string;
+  @Input() public hasPermissionToShowValues = true;
+  @Input() public locale?: string = getLocale();
+  @Input() public pageSize = Number.MAX_SAFE_INTEGER;
+  @Input() public topHoldings?: HoldingWithParents[];
 
   @Output() holdingClicked = new EventEmitter<AssetProfileIdentifier>();
 
diff --git a/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts b/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts
index 899441b7be..1a52894e36 100644
--- a/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts
+++ b/libs/ui/src/lib/world-map-chart/world-map-chart.component.ts
@@ -23,10 +23,12 @@ import svgMap from 'svgmap';
   templateUrl: './world-map-chart.component.html'
 })
 export class GfWorldMapChartComponent implements OnChanges, OnDestroy {
-  @Input() countries: { [code: string]: { name?: string; value: number } };
-  @Input() format: string;
-  @Input() isInPercentage = false;
-  @Input() locale = getLocale();
+  @Input() public countries?: {
+    [code: string]: { name?: string; value: number };
+  };
+  @Input() public format?: string;
+  @Input() public isInPercentage?: boolean = false;
+  @Input() public locale?: string = getLocale();
 
   public isLoading = true;
   public svgMapElement: any;
@@ -51,23 +53,29 @@ export class GfWorldMapChartComponent implements OnChanges, OnDestroy {
   }
 
   private initialize() {
+    if (!this.countries) {
+      return;
+    }
+
+    const countries = this.countries;
+
     if (this.isInPercentage) {
       // Convert value of countries to percentage
       let sum = 0;
-      Object.keys(this.countries).map((country) => {
-        sum += this.countries[country].value;
+      Object.keys(countries).map((country) => {
+        sum += countries[country].value;
       });
 
-      Object.keys(this.countries).map((country) => {
-        this.countries[country].value = Number(
-          ((this.countries[country].value * 100) / sum).toFixed(2)
+      Object.keys(countries).map((country) => {
+        countries[country].value = Number(
+          ((countries[country].value * 100) / sum).toFixed(2)
         );
       });
     } else {
       // Convert value to fixed-point notation
-      Object.keys(this.countries).map((country) => {
-        this.countries[country].value = Number(
-          this.countries[country].value.toFixed(2)
+      Object.keys(countries).map((country) => {
+        countries[country].value = Number(
+          countries[country].value.toFixed(2)
         );
       });
     }
@@ -84,7 +92,7 @@ export class GfWorldMapChartComponent implements OnChanges, OnDestroy {
             thousandSeparator: getNumberFormatGroup(this.locale)
           }
         },
-        values: this.countries
+        values: countries
       },
       hideFlag: true,
       minZoom: 1.06,