diff --git a/templates/table/layout.julius b/templates/table/layout.julius
index 0012e69bb..51dad6a82 100644
--- a/templates/table/layout.julius
+++ b/templates/table/layout.julius
@@ -1,5 +1,5 @@
 document.addEventListener('DOMContentLoaded', function() {
-  var dbtIdent = #{String $ dbtIdent};
+  var dbtIdent = #{String dbtIdent};
   var headerDBTableShortcircuit = #{String (toPathPiece HeaderDBTableShortcircuit)};
   var selector = '#' + dbtIdent + '-table-wrapper';
   var wrapper = document.querySelector(selector);
diff --git a/templates/widgets/modal/modal.julius b/templates/widgets/modal/modal.julius
index 14a53bde7..c4db5c2ef 100644
--- a/templates/widgets/modal/modal.julius
+++ b/templates/widgets/modal/modal.julius
@@ -1,7 +1,9 @@
 document.addEventListener('DOMContentLoaded', function() {
-  // TODO: replace for loop with one precise query for this specific modal instance
-  var modalElements = Array.from(document.querySelectorAll('.modal'));
-  modalElements.forEach(function(modal) {
+  var modalIdent = #{String modalId};
+  var selector = '#modal-' + modalIdent;
+  var modal = document.querySelector(selector);
+
+  if (modal) {
     window.utils.setup('modal', modal);
-  });
+  }
 });