diff --git a/components/virustotal.js b/components/virustotal.js
index 7ce29f2..189d575 100644
--- a/components/virustotal.js
+++ b/components/virustotal.js
@@ -111,7 +111,7 @@ polarity.export = PolarityComponent.extend({
       'numResolutionsShown',
       Math.min(this.get('maxResolutionsToShow'), this.get('details.resolutions.length'))
     );
-    console.log(this.get('details'))
+    console.log(this.get('details'));
 
     this._super(...arguments);
   },
diff --git a/integration.js b/integration.js
index 9e784b6..6c23f53 100644
--- a/integration.js
+++ b/integration.js
@@ -38,9 +38,6 @@ const debugLookupStats = {
 const throttleCache = new Map();
 
 const BUG_ICON = `<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="bug" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-bug fa-w-16"><path fill="currentColor" d="M511.988 288.9c-.478 17.43-15.217 31.1-32.653 31.1H424v16c0 21.864-4.882 42.584-13.6 61.145l60.228 60.228c12.496 12.497 12.496 32.758 0 45.255-12.498 12.497-32.759 12.496-45.256 0l-54.736-54.736C345.886 467.965 314.351 480 280 480V236c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v244c-34.351 0-65.886-12.035-90.636-32.108l-54.736 54.736c-12.498 12.497-32.759 12.496-45.256 0-12.496-12.497-12.496-32.758 0-45.255l60.228-60.228C92.882 378.584 88 357.864 88 336v-16H32.666C15.23 320 .491 306.33.013 288.9-.484 270.816 14.028 256 32 256h56v-58.745l-46.628-46.628c-12.496-12.497-12.496-32.758 0-45.255 12.498-12.497 32.758-12.497 45.256 0L141.255 160h229.489l54.627-54.627c12.498-12.497 32.758-12.497 45.256 0 12.496 12.497 12.496 32.758 0 45.255L424 197.255V256h56c17.972 0 32.484 14.816 31.988 32.9zM257 0c-61.856 0-112 50.144-112 112h224C369 50.144 318.856 0 257 0z" class=""></path></svg>`;
-
-const GLOBE_ICON = `<svg viewBox="0 0 496 512" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" data-icon="globe" data-prefix="fas" id="ember882" class="svg-inline--fa fa-globe fa-w-16 fa-fw  undefined ember-view"><path fill="currentColor" d="M336.5 160C322 70.7 287.8 8 248 8s-74 62.7-88.5 152h177zM152 256c0 22.2 1.2 43.5 3.3 64h185.3c2.1-20.5 3.3-41.8 3.3-64s-1.2-43.5-3.3-64H155.3c-2.1 20.5-3.3 41.8-3.3 64zm324.7-96c-28.6-67.9-86.5-120.4-158-141.6 24.4 33.8 41.2 84.7 50 141.6h108zM177.2 18.4C105.8 39.6 47.8 92.1 19.3 160h108c8.7-56.9 25.5-107.8 49.9-141.6zM487.4 192H372.7c2.1 21 3.3 42.5 3.3 64s-1.2 43-3.3 64h114.6c5.5-20.5 8.6-41.8 8.6-64s-3.1-43.5-8.5-64zM120 256c0-21.5 1.2-43 3.3-64H8.6C3.2 212.5 0 233.8 0 256s3.2 43.5 8.6 64h114.6c-2-21-3.2-42.5-3.2-64zm39.5 96c14.5 89.3 48.7 152 88.5 152s74-62.7 88.5-152h-177zm159.3 141.6c71.4-21.2 129.4-73.7 158-141.6h-108c-8.8 56.9-25.6 107.8-50 141.6zM19.3 352c28.6 67.9 86.5 120.4 158 141.6-24.4-33.8-41.2-84.7-50-141.6h-108z"></path></svg>`;
-
 const IGNORED_IPS = new Set(['127.0.0.1', '255.255.255.255', '0.0.0.0']);
 
 const LOOKUP_URI_BY_TYPE = {
@@ -89,7 +86,7 @@ function doLookup(entities, options, cb) {
     if (pendingLookupCache.isRunning(entity.value))
       return pendingLookupCache.addPendingLookup(entity.value, cb);
 
-    if(_isEntityBlocked(entity, options)){
+    if (_isEntityBlocked(entity, options)) {
       return;
     }
 
@@ -249,41 +246,44 @@ function _isEntityBlocked(entity, options) {
   const currentDomainUrlBlocklistRegex = options.domainUrlBlocklistRegex;
 
   // initialize regex if needed
-  if(ipBlocklistRegex === null && currentIpBlocklistRegex.length > 0){
+  if (ipBlocklistRegex === null && currentIpBlocklistRegex.length > 0) {
     Logger.debug('Initializing ip blocklist regex');
     ipBlocklistRegex = new RegExp(currentIpBlocklistRegex);
   }
 
-  if(domainUrlBlocklistRegex === null && currentDomainUrlBlocklistRegex.length > 0){
+  if (domainUrlBlocklistRegex === null && currentDomainUrlBlocklistRegex.length > 0) {
     Logger.debug('Initializing domain/url blocklist regex');
     domainUrlBlocklistRegex = new RegExp(currentDomainUrlBlocklistRegex);
   }
 
-  if(currentIpBlocklistRegex.length === 0){
+  if (currentIpBlocklistRegex.length === 0) {
     ipBlocklistRegex = null;
   }
 
-  if(currentDomainUrlBlocklistRegex.length === 0){
+  if (currentDomainUrlBlocklistRegex.length === 0) {
     domainUrlBlocklistRegex = null;
   }
 
-  if(ipBlocklistRegex !== null && ipBlocklistRegex.toString() !== `/${currentIpBlocklistRegex}/`){
+  if (
+    ipBlocklistRegex !== null &&
+    ipBlocklistRegex.toString() !== `/${currentIpBlocklistRegex}/`
+  ) {
     Logger.debug('Updating ipBlocklistRegex');
     ipBlocklistRegex = new RegExp(currentIpBlocklistRegex);
   }
 
-  if(domainUrlBlocklistRegex !== null && domainUrlBlocklistRegex.toString() !== `/${currentDomainUrlBlocklistRegex}/`){
+  if (
+    domainUrlBlocklistRegex !== null &&
+    domainUrlBlocklistRegex.toString() !== `/${currentDomainUrlBlocklistRegex}/`
+  ) {
     Logger.debug('Updating domainUrlBlocklistRegex');
     domainUrlBlocklistRegex = new RegExp(currentDomainUrlBlocklistRegex);
   }
 
-  Logger.trace(
-    { blocklist },
-    'Blocklist value'
-  );
+  Logger.trace({ blocklist }, 'Blocklist value');
 
   if (_.includes(blocklist, entity.value.toLowerCase())) {
-    Logger.debug({entity: entity.value}, 'Blocked Entity');
+    Logger.debug({ entity: entity.value }, 'Blocked Entity');
     return true;
   }
 
@@ -308,16 +308,13 @@ function _isEntityBlocked(entity, options) {
     }
   }
 
-  if(entity.isURL){
+  if (entity.isURL) {
     if (domainUrlBlocklistRegex !== null) {
       const urlObj = new URL(entity.value);
       const hostname = urlObj.hostname;
       Logger.debug(hostname, 'Hostname of url to block');
       if (domainUrlBlocklistRegex.test(hostname)) {
-        Logger.debug(
-          { url: entity.value},
-          'URL lookup blocked due to blocklist regex'
-        );
+        Logger.debug({ url: entity.value }, 'URL lookup blocked due to blocklist regex');
         return true;
       }
     }
@@ -448,7 +445,9 @@ function _lookupHash(hashesArray, entityLookup, options, done) {
 function _lookupUrl(entity, options, done) {
   if (doLookupLogging) debugLookupStats.urlLookups++;
 
-  const urlAsBase64WithoutPadding = Buffer.from(entity.value).toString('base64').replace(/=+$/, '');
+  const urlAsBase64WithoutPadding = Buffer.from(entity.value)
+    .toString('base64')
+    .replace(/=+$/, '');
   let requestOptions = {
     uri: `${LOOKUP_URI_BY_TYPE.url}/${urlAsBase64WithoutPadding}`,
     method: 'GET',
@@ -845,8 +844,27 @@ function onDetails(lookupObject, options, cb) {
         });
       });
     });
+  } else if (entity.isMD5 || entity.isSHA1 || entity.isSHA256) {
+    let fileNameOptions = {
+      uri: `https://www.virustotal.com/api/v3/files/${entity.value}`,
+      method: 'GET',
+      headers: { 'x-apikey': options.apiKey }
+    };
+
+    requestWithDefaults(fileNameOptions, (err, response, body) => {
+      _handleRequestError(err, response, body, options, (err, result) => {
+        if (err) {
+          Logger.error(err, `Error Looking up ${_.startCase(type)}`);
+          return done(err);
+        }
+
+        lookupObject.data.details.fileNames = result.data.attributes.names;
+
+        cb(null, lookupObject.data);
+      });
+    });
   } else {
-    return cb(null, lookupObject.data);
+    cb(null, lookupObject.data);
   }
 }
 
diff --git a/package.json b/package.json
index 04afd3c..9d9c837 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "main": "./integration.js",
   "name": "VirusTotal",
-  "version": "3.4.1-beta",
+  "version": "3.5.1-beta",
   "private": true,
   "dependencies": {
-    "request": "^2.88.2",
+    "async": "^3.2.0",
     "lodash": "^4.17.21",
-    "async": "^3.2.0"
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "chai": "^4.2",
diff --git a/styles/virustotal.less b/styles/virustotal.less
index 0d8777b..34793fc 100644
--- a/styles/virustotal.less
+++ b/styles/virustotal.less
@@ -9,7 +9,7 @@ b.muted {
   font-size: 8px;
 }
 
-.table-icon{
+.table-icon {
   font-size: 10px;
 }
 
@@ -86,4 +86,8 @@ td.positives {
       }
     }
   }
-}
\ No newline at end of file
+}
+
+.name-list {
+  margin-top: 15px;
+}
diff --git a/templates/virustotal.hbs b/templates/virustotal.hbs
index a719c17..593a7f6 100644
--- a/templates/virustotal.hbs
+++ b/templates/virustotal.hbs
@@ -1,383 +1,481 @@
 {{#if details.noInfoMessage}}
-    <div>
-        <span class="p-key"><em>No Information in VirusTotal</em></span>
-    </div>
+  <div>
+    <span class="p-key"><em>No Information in VirusTotal</em></span>
+  </div>
 {{else}}
-    <div class="top-section">
-        <div class="indicator">
-            <div class="tic-gauge-container">
-                <svg x="0" y="0" width="100%" height="100%" viewBox="0 0 55 50">
-                    <g transform="translate(28,25)">
-                        <g>
-                            <circle r="{{elementRadius}}" stroke="#eee" transform="rotate(-90)" fill="#fff"
-                                stroke-width="{{elementStrokeWidth}}" cx="0" cy="0"></circle>
-                            <circle stroke-dasharray="{{elementCircumference}}" r="{{elementRadius}}" stroke="{{elementColor}}"
-                                transform="rotate(-90)" fill="none" stroke-dashoffset="{{elementStrokeOffset}}"
-                                stroke-width="{{elementStrokeWidth}}" cx="0" cy="0"></circle>
-                            <text text-anchor="middle" x="0" y="0" fill="{{elementColor}}" font-size="13">
-                                {{details.positives}}
-                            </text>
-                            <text text-anchor="middle" x="-1" y="10" fill="gray" font-size="7">
-                                / {{details.total}}
-                            </text>
-                        </g>
-                    </g>
-                </svg>
-            </div>
-        </div>
-        {{#if details.tags.length}}
-            <div class="tags-container">
-                <h1 class="p-title">
-                    {{fa-icon "tags" fixedWidth=true}}
-                    Tags
-                </h1>
-                <div class="tags">
-                    {{#each details.tags as |tag|}}
-                        <div class="tag">
-                            {{tag}}
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-        {{/if}}
+  <div class="top-section">
+    <div class="indicator">
+      <div class="tic-gauge-container">
+        <svg x="0" y="0" width="100%" height="100%" viewBox="0 0 55 50">
+          <g transform="translate(28,25)">
+            <g>
+              <circle
+                r="{{elementRadius}}"
+                stroke="#eee"
+                transform="rotate(-90)"
+                fill="#fff"
+                stroke-width="{{elementStrokeWidth}}"
+                cx="0"
+                cy="0"
+              ></circle>
+              <circle
+                stroke-dasharray="{{elementCircumference}}"
+                r="{{elementRadius}}"
+                stroke="{{elementColor}}"
+                transform="rotate(-90)"
+                fill="none"
+                stroke-dashoffset="{{elementStrokeOffset}}"
+                stroke-width="{{elementStrokeWidth}}"
+                cx="0"
+                cy="0"
+              ></circle>
+              <text
+                text-anchor="middle"
+                x="0"
+                y="0"
+                fill="{{elementColor}}"
+                font-size="13"
+              >
+                {{details.positives}}
+              </text>
+              <text text-anchor="middle" x="-1" y="10" fill="gray" font-size="7">
+                /
+                {{details.total}}
+              </text>
+            </g>
+          </g>
+        </svg>
+      </div>
     </div>
-
-    <ul class="nav nav-tabs mt-2">
-        <li class="nav-item">
-            <a {{action "changeTab" "detection"}} class="nav-link {{if (or (eq activeTab "detection")(not activeTab)) "active"}}" href="#">
-                Detection
-            </a>
-        </li>
-        {{#if details.detailsTab.length}}
-            <li class="nav-item">
-                <a {{action "changeTab" "details"}} class="nav-link {{if (or (eq activeTab "details")(not activeTab)) "active"}}" href="#">
-                    Details
-                </a>
-            </li>
-        {{/if}}
-        {{#if (or details.referenceFiles.length details.historicalWhoIs.length)}}
-            <li class="nav-item">
-                <a {{action "changeTab" "relations"}} class="nav-link {{if (eq activeTab "relations") "active"}}" href="#">
-                    Relations
-                </a>
-            </li>
-        {{/if}}
-    </ul>
-
-    {{#if (eq activeTab "detection")}}
-        <div class="p-link mt-2">
-            <a href="{{details.detectionsLink}}">View Scans in VirusTotal {{fa-icon "external-link-square" class="external-link-icon"}}</a>
-        </div>
-        <div>
-            <span class="p-key">Scan Date: </span>
-            <span class="p-value">{{moment-format details.scan_date "YYYY-MM-DD HH:mm:ss UTC"}}</span>
+    {{#if details.tags.length}}
+      <div class="tags-container">
+        <h1 class="p-title">
+          {{fa-icon "tags" fixedWidth=true}}
+          Tags
+        </h1>
+        <div class="tags">
+          {{#each details.tags as |tag|}}
+            <div class="tag">
+              {{tag}}
+            </div>
+          {{/each}}
         </div>
+      </div>
+    {{/if}}
+  </div>
 
-        <div class="toggle-header">
-            <span class="p-action" {{action "toggleShowResults" "showScanResults"}}>
-                {{fa-icon "laptop" fixedWidth=true}}
-                Scan Results ({{details.positives}} of {{details.total}})
-                {{fa-icon (if showScanResults "caret-up" "caret-down") fixedWidth=true}}
-            </span>
-        </div>
-        {{#if showScanResults}}
-            <div class="scan-results">
-                <table>
-                    <tbody>
-                        {{#each details.positiveScans as |positiveScan|}}
-                            <tr>
-                                <td>
-                                    <span class="p-key">{{positiveScan.name}} </span>
-                                </td>
-                                <td>
-                                    <span class="p-value" style="color: #FF3A59">
-                                        {{fa-icon "exclamation" class="p-red table-icon" fixedWidth=true}}
-                                        {{positiveScan.result}}
-                                    </span>
-                                </td>
-                            </tr>
-                        {{/each}}
-                        {{#each details.negativeScans as |negativeScan|}}
-                            <tr>
-                                <td>
-                                    <span class="p-key">{{negativeScan.name}} </span>
-                                </td>
-                                <td>
-                                    <span class="p-value">
-                                        {{#if (eq negativeScan.result "Unrated")}}
-                                            {{fa-icon "question" class="p-grey table-icon" fixedWidth=true}}
-                                        {{else}}
-                                            {{#if (eq negativeScan.result "type-unsupported")}}
-                                                {{fa-icon "eye-slash" class="p-grey table-icon" fixedWidth=true}}
-                                            {{else}}
-                                                {{#if (eq negativeScan.result "Suspicious")}}
-                                                    {{fa-icon "info" class="p-orange table-icon" fixedWidth=true}}
-                                                {{else}}
-                                                    {{fa-icon "check" class="p-green table-icon" fixedWidth=true}}
-                                                {{/if}}
-                                            {{/if}}
-                                        {{/if}}
-                                        {{#if (eq negativeScan.result "type-unsupported")}}
-                                            <span class="p-grey">Unable to process file type</span>
-                                        {{else}}
-                                            {{#if (eq negativeScan.result "Suspicious")}}
-                                                <span class="p-orange">Suspicious</span>
-                                            {{else}}
-                                                {{#if (not negativeScan.result)}}
-                                                    Undetected
-                                                {{else}}
-                                                    {{negativeScan.result}}
-                                                {{/if}}
-                                            {{/if}}
-                                        {{/if}}
-                                    </span>
-                                </td>
-                            </tr>
-                        {{/each}}
-                    </tbody>
-                </table>
-            </div>
-        {{/if}}
+  <ul class="nav nav-tabs mt-2">
+    <li class="nav-item">
+      <a
+        {{action "changeTab" "detection"}}
+        class="nav-link {{if (or (eq activeTab "detection") (not activeTab)) "active"}}"
+        href="#"
+      >
+        Detection
+      </a>
+    </li>
+    {{#if details.detailsTab.length}}
+      <li class="nav-item">
+        <a
+          {{action "changeTab" "details"}}
+          class="nav-link {{if (or (eq activeTab "details") (not activeTab)) "active"}}"
+          href="#"
+        >
+          Details
+        </a>
+      </li>
+    {{/if}}
+    {{#if (or details.referenceFiles.length details.historicalWhoIs.length)}}
+      <li class="nav-item">
+        <a
+          {{action "changeTab" "relations"}}
+          class="nav-link {{if (eq activeTab "relations") "active"}}"
+          href="#"
+        >
+          Relations
+        </a>
+      </li>
     {{/if}}
+    {{#if (or block.entity.isMD5 block.entity.isSHA1 block.entity.isSHA256)}}
+      <li class="nav-item">
+        <a
+          {{action "changeTab" "fileNames"}}
+          class="nav-link {{if (eq activeTab "fileNames") "active"}}"
+          href="#"
+        >
+          Filenames
+        </a>
+      </li>
+    {{/if}}
+  </ul>
 
-    {{#if (eq activeTab "details")}}
-        <div class="p-link mt-2">
-            <a href="{{details.detailsLink}}">View Details in VirusTotal {{fa-icon "external-link-square" class="external-link-icon"}}</a>
-        </div>
-        {{#if details.detailsTab.length}}
-            {{#each details.detailsTab as |detailsField|}}
-                {{#if detailsField.isObject}}
-                    <h1 class="p-title">{{fa-icon icon="th-list" fixedWidth=true}} {{detailsField.key}}</h1>
-                    {{#each-in detailsField.value as |key value|}}
-                      {{#if value}}
-                        <div>
-                            <span class="p-key">{{key}}:</span>
-                            <span class="p-value">{{value}}</span>
-                        </div>
+  {{#if (eq activeTab "detection")}}
+    <div class="p-link mt-2">
+      <a href="{{details.detectionsLink}}">View Scans in VirusTotal
+        {{fa-icon "external-link-square" class="external-link-icon"}}</a>
+    </div>
+    <div>
+      <span class="p-key">Scan Date: </span>
+      <span class="p-value">{{moment-format
+          details.scan_date
+          "YYYY-MM-DD HH:mm:ss UTC"
+        }}</span>
+    </div>
+    {{! detections }}
+    <div class="toggle-header">
+      <span class="p-action" {{action "toggleShowResults" "showScanResults"}}>
+        {{fa-icon "laptop" fixedWidth=true}}
+        Scan Results ({{details.positives}}
+        of
+        {{details.total}})
+        {{fa-icon (if showScanResults "caret-up" "caret-down") fixedWidth=true}}
+      </span>
+    </div>
+    {{#if showScanResults}}
+      <div class="scan-results">
+        <table>
+          <tbody>
+            {{#each details.positiveScans as |positiveScan|}}
+              <tr>
+                <td>
+                  <span class="p-key">{{positiveScan.name}} </span>
+                </td>
+                <td>
+                  <span class="p-value" style="color: #FF3A59">
+                    {{fa-icon "exclamation" class="p-red table-icon" fixedWidth=true}}
+                    {{positiveScan.result}}
+                  </span>
+                </td>
+              </tr>
+            {{/each}}
+            {{#each details.negativeScans as |negativeScan|}}
+              <tr>
+                <td>
+                  <span class="p-key">{{negativeScan.name}} </span>
+                </td>
+                <td>
+                  <span class="p-value">
+                    {{#if (eq negativeScan.result "Unrated")}}
+                      {{fa-icon "question" class="p-grey table-icon" fixedWidth=true}}
+                    {{else}}
+                      {{#if (eq negativeScan.result "type-unsupported")}}
+                        {{fa-icon "eye-slash" class="p-grey table-icon" fixedWidth=true}}
+                      {{else}}
+                        {{#if (eq negativeScan.result "Suspicious")}}
+                          {{fa-icon "info" class="p-orange table-icon" fixedWidth=true}}
+                        {{else}}
+                          {{fa-icon "check" class="p-green table-icon" fixedWidth=true}}
+                        {{/if}}
                       {{/if}}
-                    {{/each-in}}
-                {{else}}
-                    {{#if detailsField.isList}}
-                        {{#each detailsField.value as |value|}}
-                          {{#if value}}
-                            <div>
-                                <span class="p-key">{{detailsField.key}}:</span>
-                                <span class="p-value">{{value}}</span>
-                            </div>
-                          {{/if}}
-                        {{/each}}
+                    {{/if}}
+                    {{#if (eq negativeScan.result "type-unsupported")}}
+                      <span class="p-grey">Unable to process file type</span>
                     {{else}}
-                        {{#if detailsField.isTitle}}
-                            <h1 class="p-title">{{fa-icon icon="th-list" fixedWidth=true}} {{detailsField.key}}</h1>
+                      {{#if (eq negativeScan.result "Suspicious")}}
+                        <span class="p-orange">Suspicious</span>
+                      {{else}}
+                        {{#if (not negativeScan.result)}}
+                          Undetected
                         {{else}}
-                          {{#if detailsField.value}}
-                            <div>
-                                <span class="p-key">{{detailsField.key}}:</span>
-                                <span class="p-value">{{detailsField.value}}</span>
-                            </div>
-                          {{/if}}
+                          {{negativeScan.result}}
                         {{/if}}
+                      {{/if}}
                     {{/if}}
-                {{/if}}
+                  </span>
+                </td>
+              </tr>
             {{/each}}
+          </tbody>
+        </table>
+      </div>
+    {{/if}}
+  {{/if}}
+  {{! end of detections}}
+  {{! start of file names}}
+  {{#if (eq activeTab "fileNames")}}
+    {{#if block.isLoadingDetails}}
+      <span class="p-footnote">Loading Highlights ...</span>
+    {{else}}
+      <div class="p-link mt-2">
+        <a href="{{details.detailsLink}}">View Details in VirusTotal
+          {{fa-icon "external-link-square" class="external-link-icon"}}</a>
+      </div>
+      {{#if block.data.details.fileNames}}
+        <div class="p-title">
+          {{fa-icon "laptop" fixedWidth=true}}
+          Filenames
+        </div>
+        {{#each block.data.details.fileNames as |name index|}}
+          <ul class="name-list">
+            <li class="p-value">{{name}}</li>
+          </ul>
+        {{/each}}
+      {{else}}
+        <span>No Filenames found</span>
+      {{/if}}
+    {{/if}}
+  {{/if}}
+  {{! end of file names}}
+  {{#if (eq activeTab "details")}}
+    <div class="p-link mt-2">
+      <a href="{{details.detailsLink}}">View Details in VirusTotal
+        {{fa-icon "external-link-square" class="external-link-icon"}}</a>
+    </div>
+    {{#if details.detailsTab.length}}
+      {{#each details.detailsTab as |detailsField|}}
+        {{#if detailsField.isObject}}
+          <h1 class="p-title">{{fa-icon icon="th-list" fixedWidth=true}}
+            {{detailsField.key}}</h1>
+          {{#each-in detailsField.value as |key value|}}
+            {{#if value}}
+              <div>
+                <span class="p-key">{{key}}:</span>
+                <span class="p-value">{{value}}</span>
+              </div>
+            {{/if}}
+          {{/each-in}}
+        {{else}}
+          {{#if detailsField.isList}}
+            {{#each detailsField.value as |value|}}
+              {{#if value}}
+                <div>
+                  <span class="p-key">{{detailsField.key}}:</span>
+                  <span class="p-value">{{value}}</span>
+                </div>
+              {{/if}}
+            {{/each}}
+          {{else}}
+            {{#if detailsField.isTitle}}
+              <h1 class="p-title">{{fa-icon icon="th-list" fixedWidth=true}}
+                {{detailsField.key}}</h1>
+            {{else}}
+              {{#if detailsField.value}}
+                <div>
+                  <span class="p-key">{{detailsField.key}}:</span>
+                  <span class="p-value">{{detailsField.value}}</span>
+                </div>
+              {{/if}}
+            {{/if}}
+          {{/if}}
         {{/if}}
+      {{/each}}
     {{/if}}
+  {{/if}}
 
-    {{#if (eq activeTab "relations")}}
-        <div class="p-link mt-2">
-            <a href="{{details.relationsLink}}">View Relations in VirusTotal {{fa-icon "external-link-square" class="external-link-icon"}}</a>
-        </div>
-        {{#if details.referenceFiles.length}}
-            <div class="toggle-header">
-                <span class="p-action" {{action "toggleShowResults" "showFilesReferring"}}>
-                    {{fa-icon "project-diagram" fixedWidth=true}}
-                    Files Referring ({{details.referenceFiles.length}})
-                    {{fa-icon (if showFilesReferring "caret-up" "caret-down") fixedWidth=true}}
+  {{#if (eq activeTab "relations")}}
+    <div class="p-link mt-2">
+      <a href="{{details.relationsLink}}">View Relations in VirusTotal
+        {{fa-icon "external-link-square" class="external-link-icon"}}</a>
+    </div>
+    {{#if details.referenceFiles.length}}
+      <div class="toggle-header">
+        <span class="p-action" {{action "toggleShowResults" "showFilesReferring"}}>
+          {{fa-icon "project-diagram" fixedWidth=true}}
+          Files Referring ({{details.referenceFiles.length}})
+          {{fa-icon (if showFilesReferring "caret-up" "caret-down") fixedWidth=true}}
+        </span>
+      </div>
+
+      {{#if showFilesReferring}}
+        {{#each details.referenceFiles as |referrenceFile|}}
+          <div class="section">
+            {{#if referrenceFile.name}}
+              <div>
+                <span class="p-key">Name:</span>
+                <span class="p-value">
+                  {{#if referrenceFile.link}}
+                    <a href={{referrenceFile.link}}>{{referrenceFile.name}}</a>
+                  {{else}}
+                    {{referrenceFile.name}}
+                  {{/if}}
                 </span>
-            </div>
+              </div>
+            {{/if}}
+            {{#if referrenceFile.type}}
+              <div>
+                <span class="p-key">Type:</span>
+                <span class="p-value">{{referrenceFile.type}}</span>
+              </div>
+            {{/if}}
+            {{#if referrenceFile.detections}}
+              <div>
+                <span class="p-key">Detections:</span>
+                <span class="p-value">{{referrenceFile.detections}}</span>
+              </div>
+            {{/if}}
+            {{#if referrenceFile.scannedDate}}
+              <div>
+                <span class="p-key">Scanned:</span>
+                <span class="p-value">
+                  {{#if (eq referrenceFile.scannedDate "-")}}
+                    -
+                  {{else}}
+                    {{moment-format referrenceFile.scannedDate "YYYY-MM-DD HH:mm:ss UTC"}}
+                  {{/if}}
+                </span>
+              </div>
+            {{/if}}
+          </div>
+        {{/each}}
+      {{/if}}
+    {{/if}}
+
+    {{#if details.historicalWhoIs.length}}
+      <div class="toggle-header">
+        <span class="p-action" {{action "toggleShowResults" "showHistoricalWhois"}}>
+          {{fa-icon "project-diagram" fixedWidth=true}}
+          Historical Whois Lookups ({{details.historicalWhoIs.length}})
+          {{fa-icon (if showHistoricalWhois "caret-up" "caret-down") fixedWidth=true}}
+        </span>
+      </div>
 
-            {{#if showFilesReferring}}
-                {{#each details.referenceFiles as |referrenceFile|}}
-                    <div class="section">
-                        {{#if referrenceFile.name}}
-                            <div>
-                                <span class="p-key">Name:</span>
-                                <span class="p-value">
-                                    {{#if referrenceFile.link}}
-                                        <a href={{referrenceFile.link}}>{{referrenceFile.name}}</a>
-                                    {{else}}
-                                        {{referrenceFile.name}}
-                                    {{/if}}
-                                </span>
-                            </div>
+      {{#if showHistoricalWhois}}
+        {{#if block.entity.isIP}}
+          <div class="scan-results">
+            <table>
+              <thead>
+                <tr>
+                  <th></th>
+                  <th>Last Updated</th>
+                  <th>Organization</th>
+                  <th>Email</th>
+                </tr>
+              </thead>
+            </table>
+            {{#each details.historicalWhoIs as |whoisRow index|}}
+              <table>
+                <tbody>
+                  <tr {{action "expandWhoIsRow" index}}>
+                    <td>
+                      {{fa-icon
+                        (if (get expandedWhoisMap index) "caret-up" "caret-down")
+                        fixedWidth=true
+                      }}
+                    </td>
+                    <td>
+                      <span class="p-key">{{moment-format
+                          whoisRow.last_updated
+                          "YYYY-MM-DD"
+                        }}</span>
+                    </td>
+                    <td>
+                      <span class="p-value">
+                        {{#if whoisRow.OrgName}}
+                          {{whoisRow.OrgName}}
+                        {{else}}
+                          -
                         {{/if}}
-                        {{#if referrenceFile.type}}
-                            <div>
-                                <span class="p-key">Type:</span>
-                                <span class="p-value">{{referrenceFile.type}}</span>
-                            </div>
+                      </span>
+                    </td>
+                    <td>
+                      <span class="p-value">
+                        {{#if whoisRow.OrgTechEmail}}
+                          {{whoisRow.OrgTechEmail}}
+                        {{else}}
+                          -
                         {{/if}}
-                        {{#if referrenceFile.detections}}
-                            <div>
-                                <span class="p-key">Detections:</span>
-                                <span class="p-value">{{referrenceFile.detections}}</span>
-                            </div>
+                      </span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+              {{#if (get expandedWhoisMap index)}}
+                <div class="whois-expanded">
+                  {{#each whoIsIpKeys as |ipKey|}}
+                    {{#if (get whoisRow ipKey.key)}}
+                      <div>
+                        <span class="p-key">{{ipKey.key}}:</span>
+                        <span class="p-value">
+                          {{#if ipKey.isDate}}
+                            {{moment-format
+                              (get whoisRow ipKey.key)
+                              "YYYY-MM-DD HH:mm:ss UTC"
+                            }}
+                          {{else}}
+                            {{get whoisRow ipKey.key}}
+                          {{/if}}
+                        </span>
+                      </div>
+                    {{/if}}
+                  {{/each}}
+                </div>
+              {{/if}}
+            {{/each}}
+          </div>
+        {{else}}
+          <div class="scan-results">
+            <table>
+              <thead>
+                <tr>
+                  <th></th>
+                  <th>Last Updated</th>
+                  <th>Registrar</th>
+                  <th>Registrant</th>
+                </tr>
+              </thead>
+            </table>
+            {{#each details.historicalWhoIs as |whoisRow index|}}
+              <table>
+                <tbody>
+                  <tr {{action "expandWhoIsRow" index}}>
+                    <td>
+                      {{fa-icon
+                        (if (get expandedWhoisMap index) "caret-up" "caret-down")
+                        fixedWidth=true
+                      }}
+                    </td>
+                    <td>
+                      <span class="p-key">{{moment-format
+                          whoisRow.last_updated
+                          "YYYY-MM-DD"
+                        }}</span>
+                    </td>
+                    <td>
+                      <span class="p-value">
+                        {{#if whoisRow.Registrar}}
+                          {{whoisRow.Registrar}}
+                        {{else}}
+                          -
                         {{/if}}
-                        {{#if referrenceFile.scannedDate}}
-                            <div>
-                                <span class="p-key">Scanned:</span>
-                                <span class="p-value">
-                                    {{#if (eq referrenceFile.scannedDate "-")}}
-                                        -
-                                    {{else}}
-                                        {{moment-format referrenceFile.scannedDate "YYYY-MM-DD HH:mm:ss UTC"}}
-                                    {{/if}}
-                                </span>
-                            </div>
+                      </span>
+                    </td>
+                    <td>
+                      <span class="p-value">
+                        {{#if whoisRow.Registrant}}
+                          {{whoisRow.Registrant}}
+                        {{else}}
+                          -
                         {{/if}}
-                    </div>
-                {{/each}}
-            {{/if}}
-        {{/if}}
-
-        {{#if details.historicalWhoIs.length}}
-            <div class="toggle-header">
-                <span class="p-action" {{action "toggleShowResults" "showHistoricalWhois"}}>
-                    {{fa-icon "project-diagram" fixedWidth=true}}
-                    Historical Whois Lookups ({{details.historicalWhoIs.length}})
-                    {{fa-icon (if showHistoricalWhois "caret-up" "caret-down") fixedWidth=true}}
-                </span>
-            </div>
-
-            {{#if showHistoricalWhois}}
-                {{#if block.entity.isIP}}
-                    <div class="scan-results">
-                        <table>
-                            <thead>
-                                <tr>
-                                    <th></th>
-                                    <th>Last Updated</th>
-                                    <th>Organization</th>
-                                    <th>Email</th>
-                                </tr>
-                            </thead>
-                        </table>
-                        {{#each details.historicalWhoIs as |whoisRow index|}}
-                            <table>
-                                <tbody>
-                                    <tr {{action "expandWhoIsRow" index}}>
-                                        <td>
-                                            {{fa-icon (if (get expandedWhoisMap index) "caret-up" "caret-down") fixedWidth=true}}
-                                        </td>
-                                        <td>
-                                            <span class="p-key">{{moment-format whoisRow.last_updated "YYYY-MM-DD"}}</span>
-                                        </td>
-                                        <td>
-                                            <span class="p-value">
-                                                {{#if whoisRow.OrgName}}
-                                                    {{whoisRow.OrgName}}
-                                                {{else}}
-                                                    -
-                                                {{/if}}
-                                            </span>
-                                        </td>
-                                        <td>
-                                            <span class="p-value">
-                                                {{#if whoisRow.OrgTechEmail}}
-                                                    {{whoisRow.OrgTechEmail}}
-                                                {{else}}
-                                                    -
-                                                {{/if}}
-                                            </span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            {{#if (get expandedWhoisMap index)}}
-                                <div class="whois-expanded">
-                                    {{#each whoIsIpKeys as |ipKey|}}
-                                        {{#if (get whoisRow ipKey.key)}}
-                                            <div>
-                                                <span class="p-key">{{ipKey.key}}:</span>
-                                                <span class="p-value">
-                                                    {{#if ipKey.isDate}}
-                                                        {{moment-format (get whoisRow ipKey.key) "YYYY-MM-DD HH:mm:ss UTC"}}
-                                                    {{else}}
-                                                        {{get whoisRow ipKey.key}}
-                                                    {{/if}}
-                                                </span>
-                                            </div>
-                                        {{/if}}
-                                    {{/each}}
-                                </div>
-                            {{/if}}
-                        {{/each}}
-                    </div>
-                {{else}}
-                    <div class="scan-results">
-                        <table>
-                            <thead>
-                                <tr>
-                                    <th></th>
-                                    <th>Last Updated</th>
-                                    <th>Registrar</th>
-                                    <th>Registrant</th>
-                                </tr>
-                            </thead>
-                        </table>
-                        {{#each details.historicalWhoIs as |whoisRow index|}}
-                            <table>
-                                <tbody>
-                                    <tr {{action "expandWhoIsRow" index}}>
-                                        <td>
-                                            {{fa-icon (if (get expandedWhoisMap index) "caret-up" "caret-down") fixedWidth=true}}
-                                        </td>
-                                        <td>
-                                            <span class="p-key">{{moment-format whoisRow.last_updated "YYYY-MM-DD"}}</span>
-                                        </td>
-                                        <td>
-                                            <span class="p-value">
-                                                {{#if whoisRow.Registrar}}
-                                                    {{whoisRow.Registrar}}
-                                                {{else}}
-                                                    -
-                                                {{/if}}
-                                            </span>
-                                        </td>
-                                        <td>
-                                            <span class="p-value">
-                                                {{#if whoisRow.Registrant}}
-                                                    {{whoisRow.Registrant}}
-                                                {{else}}
-                                                    -
-                                                {{/if}}
-                                            </span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            {{#if (get expandedWhoisMap index)}}
-                                <div class="whois-expanded">
-                                    {{#each whoIsDomainKeys as |domainKey|}}
-                                        {{#if (get whoisRow domainKey.key)}}
-                                            <div>
-                                                <span class="p-key">{{domainKey.key}}:</span>
-                                                <span class="p-value">
-                                                    {{#if domainKey.isDate}}
-                                                        {{moment-format (get whoisRow domainKey.key) "YYYY-MM-DD HH:mm:ss UTC"}}
-                                                    {{else}}
-                                                        {{get whoisRow domainKey.key}}
-                                                    {{/if}}
-                                                </span>
-                                            </div>
-                                        {{/if}}
-                                    {{/each}}
-                                </div>
-                            {{/if}}
-                        {{/each}}
-                    </div>
-                {{/if}}
-            {{/if}}
+                      </span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+              {{#if (get expandedWhoisMap index)}}
+                <div class="whois-expanded">
+                  {{#each whoIsDomainKeys as |domainKey|}}
+                    {{#if (get whoisRow domainKey.key)}}
+                      <div>
+                        <span class="p-key">{{domainKey.key}}:</span>
+                        <span class="p-value">
+                          {{#if domainKey.isDate}}
+                            {{moment-format
+                              (get whoisRow domainKey.key)
+                              "YYYY-MM-DD HH:mm:ss UTC"
+                            }}
+                          {{else}}
+                            {{get whoisRow domainKey.key}}
+                          {{/if}}
+                        </span>
+                      </div>
+                    {{/if}}
+                  {{/each}}
+                </div>
+              {{/if}}
+            {{/each}}
+          </div>
         {{/if}}
+      {{/if}}
     {{/if}}
-{{/if}}
+  {{/if}}
+{{/if}}
\ No newline at end of file