diff --git a/layouts/partials/paige/comments/cactus.html b/layouts/partials/paige/comments/cactus.html
index f6e5f583..dec3266c 100644
--- a/layouts/partials/paige/comments/cactus.html
+++ b/layouts/partials/paige/comments/cactus.html
@@ -1,6 +1,6 @@
 {{ $page := . }}
 
-{{ if $page.Param "paige.comments.cactus" }}
+{{ with $page.Param "paige.comments.cactus" }}
     <div class="mb-3" id="paige-comments">
         <script type="text/javascript" src="https://latest.cactus.chat/cactus.js"></script>
         <link rel="stylesheet" href="https://latest.cactus.chat/style.css" type="text/css">
@@ -10,7 +10,7 @@
             node: document.getElementById("comment-section"),
             defaultHomeserverUrl: "https://matrix.cactus.chat:8448",
             serverName: "cactus.chat",
-            siteName: "{{ $page.Param `paige.comments.cactus.account_id` | safeJS }}",
+            siteName: "{{ .account_id | safeJS }}",
             commentSectionId: "{{ $page.RelPermalink | safeJS }}"
         })
         </script>
diff --git a/layouts/partials/paige/comments/graphcomment.html b/layouts/partials/paige/comments/graphcomment.html
index 603c6a94..19f11042 100644
--- a/layouts/partials/paige/comments/graphcomment.html
+++ b/layouts/partials/paige/comments/graphcomment.html
@@ -1,11 +1,11 @@
 {{ $page := . }}
 
-{{ if $page.Param "paige.comments.graphcomment" }}
+{{ with $page.Param "paige.comments.graphcomment" }}
     <div class="mb-3" id="paige-comments">
         <div id="graphcomment"></div>
         <script type="text/javascript">
         var __semio__params = {
-            graphcommentId: "{{ $page.Param `paige.comments.graphcomment.account_id` | safeJS }}",
+            graphcommentId: "{{ .account_id | safeJS }}",
             behaviour: {
                 uid: "{{ $page.RelPermalink | safeJS }}"
             }
diff --git a/layouts/partials/paige/comments/hyvor.html b/layouts/partials/paige/comments/hyvor.html
index 5ab5ff3f..86cc793a 100644
--- a/layouts/partials/paige/comments/hyvor.html
+++ b/layouts/partials/paige/comments/hyvor.html
@@ -1,10 +1,10 @@
 {{ $page := . }}
 
-{{ if $page.Param "paige.comments.hyvor" }}
+{{ with $page.Param "paige.comments.hyvor" }}
     <div class="mb-3" id="paige-comments">
         <div id="hyvor-talk-view"></div>
         <script type="text/javascript">
-        var HYVOR_TALK_WEBSITE = "{{ $page.Param "paige.comments.hyvor.account_id" | safeJS }}";
+        var HYVOR_TALK_WEBSITE = "{{ .account_id | safeJS }}";
         var HYVOR_TALK_CONFIG = {
             url: false,
             id: "{{ $page.RelPermalink | safeJS }}"
diff --git a/layouts/partials/paige/comments/intensedebate.html b/layouts/partials/paige/comments/intensedebate.html
index 5c420fce..c0b0b8ca 100644
--- a/layouts/partials/paige/comments/intensedebate.html
+++ b/layouts/partials/paige/comments/intensedebate.html
@@ -1,9 +1,9 @@
 {{ $page := . }}
 
-{{ if $page.Param "paige.comments.intensedebate" }}
+{{ with $page.Param "paige.comments.intensedebate" }}
     <div class="mb-3" id="paige-comments">
         <script>
-        var idcomments_acct = "{{ $page.Param "paige.comments.intensedebate.account_id" | safeJS }}";
+        var idcomments_acct = "{{ .account_id | safeJS }}";
         var idcomments_post_id = "{{ $page.RelPermalink | safeJS }}";
         var idcomments_post_url = "{{ $page.Permalink | safeJS }}";
         </script>
diff --git a/layouts/partials/paige/comments/remark42.html b/layouts/partials/paige/comments/remark42.html
index 3196ca4e..b1d3198b 100644
--- a/layouts/partials/paige/comments/remark42.html
+++ b/layouts/partials/paige/comments/remark42.html
@@ -1,12 +1,12 @@
 {{ $page := . }}
 
-{{ if $page.Param "paige.comments.remark42" }}
+{{ with $page.Param "paige.comments.remark42" }}
     <div class="mb-3" id="paige-comments">
         <div id="remark42"></div>
         <script>
         var remark_config = {
-            host: "{{ $page.Param `paige.comments.remark42.host_url` | safeJS }}",
-            site_id: "{{ $page.Param `paige.comments.remark42.site_id` | default `remark` | safeJS }}"
+            host: "{{ .host_url | safeJS }}",
+            site_id: "{{ .site_id | default `remark` | safeJS }}"
         }
         </script>
         <script>!function(e,n){for(var o=0;o<e.length;o++){var r=n.createElement("script"),c=".js",d=n.head||n.body;"noModule"in r?(r.type="module",c=".mjs"):r.async=!0,r.defer=!0,r.src=remark_config.host+"/web/"+e[o]+c,d.appendChild(r)}}(remark_config.components||["embed"],document);</script>
diff --git a/layouts/partials/paige/comments/replybox.html b/layouts/partials/paige/comments/replybox.html
index 05f75325..819ab6f4 100644
--- a/layouts/partials/paige/comments/replybox.html
+++ b/layouts/partials/paige/comments/replybox.html
@@ -1,11 +1,11 @@
 {{ $page := . }}
 
-{{ if $page.Param "paige.comments.replybox" }}
+{{ with $page.Param "paige.comments.replybox" }}
     <div class="mb-3" id="paige-comments">
         <div id="replybox"></div>
         <script>
         window.replybox = {
-            site: "{{ $page.Param "paige.comments.replybox.account_id" | safeJS }}",
+            site: "{{ .account_id | safeJS }}",
             identifier: "{{ $page.RelPermalink | safeJS }}"
         };
         </script>