diff --git a/dev/js/src/match/querycreator.js b/dev/js/src/match/querycreator.js
index d9c41de..caae6a3 100644
--- a/dev/js/src/match/querycreator.js
+++ b/dev/js/src/match/querycreator.js
@@ -65,6 +65,9 @@
 
         if (target.tagName == 'TD') {
 
+          if (target.innerText == '')
+            return;
+
           // Check foundry and layer
           var head    = target.parentNode.getElementsByTagName('th');
           var foundry = head[0].innerText;
diff --git a/dev/scss/main/matchinfo.scss b/dev/scss/main/matchinfo.scss
index 801503f..09bc90b 100644
--- a/dev/scss/main/matchinfo.scss
+++ b/dev/scss/main/matchinfo.scss
@@ -134,6 +134,9 @@
   thead th:not(:nth-child(1)):not(:nth-child(2)) {
     cursor: pointer;
   }
+  td:empty {
+    cursor: default;
+  }
   tr {
     outline: none;
     > td.chosen,