diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index d8608abb..04f65a8f 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -214,7 +214,8 @@
               <a class="uk-flex uk-flex-middle uk-link-reset">
                 <icon customClass="bip-icon-hover" [flex]="true" [ratio]="0.7"
                       [name]="result.measure.bip[0].icon"></icon>
-                <span class="uk-margin-xsmall-left">{{result.measure.bip[0].value}}</span>
+                <span *ngIf="isNumber(result.measure.bip[0].value)" class="uk-margin-xsmall-left">{{formatNumber(result.measure.bip[0].value)}}</span>
+                <span *ngIf="!isNumber(result.measure.bip[0].value)" class="uk-margin-xsmall-left">{{result.measure.bip[0].value}}</span>
               </a>
               <div uk-drop="pos: top-right" class="uk-card uk-card-default uk-border uk-box-no-shadow uk-padding-small">
                 <table>
@@ -223,7 +224,8 @@
                       <icon [flex]="true" [ratio]="0.7" [name]="metric.icon"></icon>
                     </td>
                     <td class="uk-text-capitalize">{{metric.name}}</td>
-                    <td class="uk-text-bolder">{{metric.value}}</td>
+                    <td *ngIf="isNumber(metric.value)" class="uk-text-bolder">{{metric.value | number}}</td>
+                    <td *ngIf="!isNumber(metric.value)"class="uk-text-bolder">{{metric.value}}</td>
                   </tr>
                 </table>
                 <div class="uk-margin-top uk-flex uk-flex-middle uk-flex-center">
@@ -252,7 +254,7 @@
                 <div class="uk-margin-top uk-flex uk-flex-middle uk-flex-center">
                   <span class="uk-text-uppercase">Powered by </span>
                   <img class="uk-margin-xsmall-left" width="15" src="assets/common-assets/logo-small-usage-counts.png"
-                    loading="lazy" alt="BIP!">
+                    loading="lazy" alt="Usage counts">
                 </div>
               </div>
             </ng-container>
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index 9c041854..6352e9b9 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -223,6 +223,10 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
     return formatted.number + formatted.size;
   }
 
+  public isNumber(value): boolean {
+    return typeof value === 'number';
+  }
+
   public getAccessLabel(accessRight) : string {
     if(accessRight) {
       return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access"));