diff --git a/html/js/routes/hunt.js b/html/js/routes/hunt.js
index 0681caeb..94093092 100644
--- a/html/js/routes/hunt.js
+++ b/html/js/routes/hunt.js
@@ -1020,6 +1020,11 @@ const huntComponent = {
     filterVisibleFields(eventModule, eventDataset, fields) {
       if (this.eventFields) {
         var filteredFields = null;
+        if (eventDataset) {
+          if(eventDataset.indexOf('.') !== -1) {
+            eventDataset = eventDataset.substring(eventDataset.indexOf('.') + 1);
+          }
+        }
         if (eventModule && eventDataset) {
           filteredFields = this.eventFields[":" + eventModule + ":" + eventDataset];
         }
diff --git a/html/js/routes/hunt.test.js b/html/js/routes/hunt.test.js
index 68f654dd..33ab7826 100644
--- a/html/js/routes/hunt.test.js
+++ b/html/js/routes/hunt.test.js
@@ -910,3 +910,17 @@ test('huntBetween', () => {
     }
   }
 });
+
+test('filterVisibleFields', () => {
+  comp.eventFields = {
+    ':module:dataset': 'a',
+    '::dataset': 'b',
+    ':module:': 'c',
+    'default': 'default',
+  };
+
+  expect(comp.filterVisibleFields('module', 'module.dataset', [])).toEqual('a');
+  expect(comp.filterVisibleFields('', 'module.dataset', [])).toEqual('b');
+  expect(comp.filterVisibleFields('module', 'otherData', [])).toEqual('c');
+  expect(comp.filterVisibleFields('A', 'B', [])).toEqual('default');
+});