diff --git a/frontend/src/app/components/ui-components/table-display-fields/point/point.component.html b/frontend/src/app/components/ui-components/table-display-fields/point/point.component.html
index 2e30aeeca..394c892b9 100644
--- a/frontend/src/app/components/ui-components/table-display-fields/point/point.component.html
+++ b/frontend/src/app/components/ui-components/table-display-fields/point/point.component.html
@@ -1,11 +1,13 @@
-<div class="field-wrapper" *ngIf="formattedPoint">
-  <span class="value-wrapper" [matTooltip]="formattedPoint">{{ formattedPoint }}</span>
-  <button mat-icon-button
-      class="copy-button"
-      [cdkCopyToClipboard]="formattedPoint"
-      matTooltip="Copy to clipboard"
-      (cdkCopyToClipboardCopied)="onCopyToClipboard.emit('Field value was copied to clipboard.')"
-      (click)="$event.stopPropagation()">
-    <mat-icon>content_copy</mat-icon>
-  </button>
-</div>
+@if (formattedPoint) {
+  <div class="field-wrapper">
+    <span class="value-wrapper" [matTooltip]="formattedPoint">{{ formattedPoint }}</span>
+    <button mat-icon-button
+        class="copy-button"
+        [cdkCopyToClipboard]="formattedPoint"
+        matTooltip="Copy to clipboard"
+        (cdkCopyToClipboardCopied)="onCopyToClipboard.emit('Field value was copied to clipboard.')"
+        (click)="$event.stopPropagation()">
+      <mat-icon>content_copy</mat-icon>
+    </button>
+  </div>
+}
diff --git a/frontend/src/app/components/ui-components/table-display-fields/url/url.component.html b/frontend/src/app/components/ui-components/table-display-fields/url/url.component.html
index e10a7f1bb..8f2d0cc36 100644
--- a/frontend/src/app/components/ui-components/table-display-fields/url/url.component.html
+++ b/frontend/src/app/components/ui-components/table-display-fields/url/url.component.html
@@ -1,13 +1,15 @@
 <div class="field-display">
   <span class="field-value">
-    <a *ngIf="isValidUrl"
-        [href]="hrefValue" target="_blank"
-        class="url-link"
-        (click)="$event.stopPropagation()">
-        <mat-icon class="url-link__icon" fontSet="material-symbols-outlined">link</mat-icon>
-        {{value() || '—'}}
-    </a>
-    <span *ngIf="!isValidUrl">{{value() || '—'}}</span>
+    @if (isValidUrl) {
+      <a [href]="hrefValue" target="_blank"
+          class="url-link"
+          (click)="$event.stopPropagation()">
+          <mat-icon class="url-link__icon" fontSet="material-symbols-outlined">link</mat-icon>
+          {{value() || '—'}}
+      </a>
+    } @else {
+      <span>{{value() || '—'}}</span>
+    }
   </span>
   <button type="button" mat-icon-button
       class="field-copy-button"