diff --git a/frontend/src/app/component/file-uploader/file-uploader.component.html b/frontend/src/app/component/file-uploader/file-uploader.component.html
index e431d92..a3491e6 100644
--- a/frontend/src/app/component/file-uploader/file-uploader.component.html
+++ b/frontend/src/app/component/file-uploader/file-uploader.component.html
@@ -12,34 +12,46 @@
 
 <mat-form-field class="margin-right">
   <mat-label>* Name</mat-label>
-  <input matInput
+  <input matInput *ngIf="meta"
          placeholder="Name"
-         [(ngModel)]="meta ? meta.name : name">
+         [(ngModel)]="meta.name">
+  <input matInput *ngIf="!meta"
+         placeholder="Name"
+         [(ngModel)]="name">
 </mat-form-field>
 
 <mat-form-field class="margin-right">
   <mat-label>Tag</mat-label>
-  <input matInput
+  <input matInput *ngIf="meta"
          placeholder="Add a tag"
-         [(ngModel)]="meta ? meta.tag : tag">
+         [(ngModel)]="meta.tag">
+  <input matInput *ngIf="!meta"
+         placeholder="Add a tag"
+         [(ngModel)]="tag">
 </mat-form-field>
 
 <mat-form-field *ngIf="mode==='post'"
                 class="margin-right"
 >
   <mat-label>* Longitude</mat-label>
-  <input matInput
+  <input matInput *ngIf="meta"
          placeholder="Add longitude"
-         [(ngModel)]="meta ? meta.longitude : longitude">
+         [(ngModel)]="meta.longitude">
+  <input matInput *ngIf="!meta"
+         placeholder="Add longitude"
+         [(ngModel)]="longitude">
 </mat-form-field>
 
 <mat-form-field *ngIf="mode==='post'"
                 class="margin-right"
 >
   <mat-label>* Latitude</mat-label>
-  <input matInput
+  <input matInput *ngIf="meta"
          placeholder="Add latitude"
-         [(ngModel)]="meta ? meta.latitude : latitude">
+         [(ngModel)]="meta.latitude">
+  <input matInput *ngIf="!meta"
+         placeholder="Add latitude"
+         [(ngModel)]="latitude">
 </mat-form-field>
 
 <button type="button"
diff --git a/frontend/src/app/component/images/images.component.html b/frontend/src/app/component/images/images.component.html
index 1a7b45a..9cbffd4 100644
--- a/frontend/src/app/component/images/images.component.html
+++ b/frontend/src/app/component/images/images.component.html
@@ -51,7 +51,7 @@
         <div style="display: block; width: 100%">
           <h3>Metadata:</h3>
           <p *ngIf="image.filename">filename: {{image.filename}}</p>
-          <p *ngIf="image.tag">tag: {{image.tag}}</p>
+<!--          <p *ngIf="image.tag">tag: {{image.tag}}</p>-->
           <p *ngIf="image.latitude">latitude: {{image.latitude}}</p>
           <p *ngIf="image.longitude">longitude: {{image.longitude}}</p>
           <p *ngIf="image.version">version: {{image.version}}</p>
diff --git a/frontend/src/app/component/landing/landing.component.html b/frontend/src/app/component/landing/landing.component.html
index 902ec53..66ca53c 100644
--- a/frontend/src/app/component/landing/landing.component.html
+++ b/frontend/src/app/component/landing/landing.component.html
@@ -6,7 +6,7 @@
   </span>
 </h1>
 
-<mat-tab-group *ngIf="images">
+<mat-tab-group *ngIf="storageHealth; else loading">
   <mat-tab label="Images">
     <app-images [images]="images" (reload)="loadImages()"></app-images>
   </mat-tab>
@@ -14,3 +14,7 @@
     <app-map [images]="images"></app-map>
   </mat-tab>
 </mat-tab-group>
+
+<ng-template #loading>
+  Loading ...
+</ng-template>