diff --git a/module/fid_bbi/src/fid_bbi/View/Helper/Root/RecordDataFormatterFactory.php b/module/fid_bbi/src/fid_bbi/View/Helper/Root/RecordDataFormatterFactory.php
index e9de86d03a5ebe087f8abc2d98ba8a5a8ca5c861..e28e602ed3691a9fa9a9cba010390100238cf376 100644
--- a/module/fid_bbi/src/fid_bbi/View/Helper/Root/RecordDataFormatterFactory.php
+++ b/module/fid_bbi/src/fid_bbi/View/Helper/Root/RecordDataFormatterFactory.php
@@ -106,7 +106,9 @@ class RecordDataFormatterFactory extends \fid\View\Helper\Root\RecordDataFormatt
         $spec->setTemplateLine(
             'Related Items', 'getAllRecordLinks', 'data-allRecordLinks.phtml'
         );
-        $spec->setTemplateLine(1, true, 'data-tags.phtml');
+        $spec->setTemplateLine('Tags', true, 'data-tags.phtml',[
+            'labelFunction' => function() {return null;}
+        ]);
         return $spec->getArray();
     }
 
@@ -332,7 +334,9 @@ class RecordDataFormatterFactory extends \fid\View\Helper\Root\RecordDataFormatt
                 'useCache' => true
             ]
         );
-        $spec->setTemplateLine(2, true, 'data-tags.phtml');
+        $spec->setTemplateLine('Tags', true, 'data-tags.phtml',[
+            'labelFunction' => function() {return null;}
+        ]);
         return $spec->getArray();
     }
 
@@ -442,7 +446,9 @@ class RecordDataFormatterFactory extends \fid\View\Helper\Root\RecordDataFormatt
             'Source',
             'getMegaCollection'
         );
-        $spec->setTemplateLine(3, true, 'data-tags.phtml');
+        $spec->setTemplateLine('Tags', true, 'data-tags.phtml',[
+            'labelFunction' => function() {return null;}
+        ]);
         return $spec->getArray();
     }
 }
diff --git a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml
index 17cdc4e69a2f08047a6d5f1276f3d95cb979f6fa..6175ce2ce23d8d6616747489497e4dab11b16e7f 100644
--- a/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/DefaultRecord/core.phtml
@@ -64,7 +64,7 @@
         <table class="table table-striped">
           <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
             <?php foreach ($coreFields as $current): ?>
-                <?php if (is_numeric($current['label'])): ?>
+                <?php if (is_null($current['label'])): ?>
                     <?=$current['value']?>
                 <?php else: ?>
                     <tr>
diff --git a/themes/fid_bbi/templates/RecordDriver/SolrMarc/core.phtml b/themes/fid_bbi/templates/RecordDriver/SolrMarc/core.phtml
index 79f757058f35fc830bc68a798681b3cee3217821..62626dd26dfbe69bb44f22a2a164cd03afa77db6 100644
--- a/themes/fid_bbi/templates/RecordDriver/SolrMarc/core.phtml
+++ b/themes/fid_bbi/templates/RecordDriver/SolrMarc/core.phtml
@@ -63,7 +63,7 @@
         <table class="table table-striped">
           <caption class="sr-only"><?=$this->transEsc('Bibliographic Details')?></caption>
             <?php foreach ($coreFields as $current): ?>
-              <?php if (is_numeric($current['label'])): ?>
+              <?php if (is_null($current['label'])): ?>
                   <?=$current['value']?>
               <?php else: ?>
                   <tr>