diff --git a/frontend/src/app/site-card/site-card.component.html b/frontend/src/app/site-card/site-card.component.html
index 928a341b2d5670ffa717231ab76633b78c06e467..76f55e43fe61e98bbb8e473923ef1b76dcc6f90c 100644
--- a/frontend/src/app/site-card/site-card.component.html
+++ b/frontend/src/app/site-card/site-card.component.html
@@ -3,14 +3,11 @@
 <ng-container *ngIf="location">
   <h3 class="mb-4">
     Site: {{ location.locationName }}
-
-
   </h3>
 
   <faidare-map [locations]="[location]"></faidare-map>
 
 
-
   <faidare-card-section
     header="Details">
     <ng-template>
@@ -52,7 +49,7 @@
 
         <faidare-card-row
           label="Coordinates precision"
-          [test]="location.additionalInfo && location.additionalInfo[' Coordinates precision']">
+          [test]="location.additionalInfo && location.additionalInfo['Coordinates precision']">
           <ng-template>
             {{ location.additionalInfo['Coordinates precision'] }}
           </ng-template>
@@ -76,7 +73,7 @@
 
         <faidare-card-row
           label="Geographical location"
-          [test]="location.additionalInfo && location.additionalInfo[' Geographical location']">
+          [test]="location.additionalInfo && location.additionalInfo['Geographical location']">
           <ng-template>
             {{ location.additionalInfo['Geographical location'] }}
           </ng-template>
@@ -84,7 +81,7 @@
 
         <faidare-card-row
           label="Country name"
-          [test]="location.countryName && !location.additionalInfo['Geographical location']">
+          [test]="!(location.additionalInfo && location.additionalInfo['Geographical location']) && location.countryName">
           <ng-template>
             {{ location.countryName }}
           </ng-template>
@@ -92,7 +89,7 @@
 
         <faidare-card-row
           label="Country code"
-          [test]="location.countryCode && location.additionalInfo && !location.additionalInfo['Geographical location']">
+          [test]="!(location.additionalInfo && location.additionalInfo['Geographical location']) && location.countryCode">
           <ng-template>
             {{ location.countryCode }}
           </ng-template>
@@ -113,7 +110,7 @@
 
         <faidare-card-row
           label="Exposure"
-          [test]="location.additionalInfo && location.additionalInfo[' Exposure']">
+          [test]="location.additionalInfo && location.additionalInfo['Exposure']">
           <ng-template>
             {{ location.additionalInfo['Exposure'] }}
           </ng-template>
@@ -121,7 +118,7 @@
 
         <faidare-card-row
           label="Topography"
-          [test]="location.additionalInfo && location.additionalInfo[' Topography']">
+          [test]="location.additionalInfo && location.additionalInfo['Topography']">
           <ng-template>
             {{ location.additionalInfo['Topography'] }}
           </ng-template>
@@ -129,7 +126,7 @@
 
         <faidare-card-row
           label="Environment type"
-          [test]="location.additionalInfo && location.additionalInfo[' Environment type']">
+          [test]="location.additionalInfo && location.additionalInfo['Environment type']">
           <ng-template>
             {{ location.additionalInfo['Environment type'] }}
           </ng-template>
@@ -137,7 +134,7 @@
 
         <faidare-card-row
           label="Distance to city"
-          [test]="location.additionalInfo && location.additionalInfo[' Distance to city']">
+          [test]="location.additionalInfo && location.additionalInfo['Distance to city']">
           <ng-template>
             {{ location.additionalInfo['Distance to city'] }}
           </ng-template>
@@ -145,7 +142,7 @@
 
         <faidare-card-row
           label="Direction from city"
-          [test]="location.additionalInfo && location.additionalInfo[' Direction from city']">
+          [test]="location.additionalInfo && location.additionalInfo['Direction from city']">
           <ng-template>
             {{ location.additionalInfo['Direction from city'] }}
           </ng-template>
@@ -153,7 +150,7 @@
 
         <faidare-card-row
           label="Comment"
-          [test]="location.additionalInfo && location.additionalInfo[' Comment']">
+          [test]="location.additionalInfo && location.additionalInfo['Comment']">
           <ng-template>
             {{ location.additionalInfo['Comment'] }}
           </ng-template>