diff --git a/templates/table/layout.julius b/templates/table/layout.julius
index 43a6595a3..e22b451b9 100644
--- a/templates/table/layout.julius
+++ b/templates/table/layout.julius
@@ -5,7 +5,7 @@
 
   window.utils.asyncTable = function(wrapper, options) {
 
-    var tableIdent = #{String dbtIdent};
+    var tableIdent = wrapper.dataset.dbtIdent;
     var shortCircuitHeader = #{String (toPathPiece HeaderDBTableShortcircuit)};
 
     var ths = [];
@@ -14,7 +14,7 @@
     var scrollTable;
 
     function init() {
-      var table = wrapper.querySelector('#' + tableIdent);
+    var table = wrapper.querySelector('#' + tableIdent);
       if (!table) {
         return;
       }
@@ -69,7 +69,7 @@
       });
 
       if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + tableIdent + '-pagesize]')
+        var pagesizeSelect = pagesizeForm.querySelector('[name=' + tableIdent + '-pagesize]');
         pagesizeSelect.addEventListener('change', changePagesizeHandler);
       }
     }
@@ -167,9 +167,11 @@
 })();
 
 document.addEventListener('DOMContentLoaded', function() {
-  var selector = '#' + #{String $ dbtIdent} + '-table-wrapper:not(.js-initialized)';
+  var dbtIdent = #{String $ dbtIdent};
+  var selector = '#' + dbtIdent + '-table-wrapper:not(.js-initialized)';
   var wrapper = document.querySelector(selector);
   if (wrapper) {
+    wrapper.dataset.dbtIdent = dbtIdent;
     window.utils.asyncTable(wrapper);
   }
 });