diff --git a/layouts/_partials/cv/organisation/get-title.html b/layouts/_partials/cv/organisation/get-title.html
index 50d7e5f..22f3f35 100644
--- a/layouts/_partials/cv/organisation/get-title.html
+++ b/layouts/_partials/cv/organisation/get-title.html
@@ -1,6 +1,7 @@
 {{- /*
   Displays an organisation's title.
 
+  @params pc  The page context.
   @params organisation  The organisation to display.
   @params site_redact   The site-level redaction display settings.
   */
@@ -19,7 +20,7 @@
   <li>
     <a href="{{ .organisation.RelPermalink }}"
       >{{ if ( .organisation.Params.markup_title ) }}
-        {{ .organisation.Params.markup_title | safeHTML }}
+        {{ .organisation.Params.markup_title | $.pc.Page.RenderString | safeHTML }}
       {{ else if ( .organisation.Params.titleLang  ) }}
         {{ partial "text/foreign-text.html" ( dict "original" .organisation.Title "lang" .organisation.Params.titleLang "translation" .organisation.Params.titleTrans ) }}
       {{ else }}
diff --git a/layouts/_partials/single/main-body/links/external-links.html b/layouts/_partials/single/main-body/links/external-links.html
index 09f80d4..6d6d86f 100644
--- a/layouts/_partials/single/main-body/links/external-links.html
+++ b/layouts/_partials/single/main-body/links/external-links.html
@@ -34,7 +34,7 @@
       {{ end }}
       {{- partial "single/main-body/links/link/title-link.html" ( $params | merge ( dict "title" .title "link" .link ) ) }}
     {{ else }}
-      {{- partial "single/main-body/links/link/basic-link.html" $params }}
+      {{- partial "single/main-body/links/link/basic-link.html" . }}
     {{ end }}
   {{- end -}}
 </ul>
diff --git a/layouts/_partials/single/main-body/links/internal-links.html b/layouts/_partials/single/main-body/links/internal-links.html
index df3f894..efc804a 100644
--- a/layouts/_partials/single/main-body/links/internal-links.html
+++ b/layouts/_partials/single/main-body/links/internal-links.html
@@ -40,7 +40,7 @@
         {{- partial "single/main-body/links/link/title-link.html" ( $params | merge ( dict "title" .title "link" .link ) ) }}
       {{- end -}}
     {{ else }}
-      {{- partial "single/main-body/links/link/basic-link.html" $params }}
+      {{- partial "single/main-body/links/link/basic-link.html" . }}
     {{ end }}
   {{- end -}}
 </ul>
diff --git a/layouts/_partials/single/main-body/links/link/basic-link.html b/layouts/_partials/single/main-body/links/link/basic-link.html
index 185b986..35f58ea 100644
--- a/layouts/_partials/single/main-body/links/link/basic-link.html
+++ b/layouts/_partials/single/main-body/links/link/basic-link.html
@@ -1,23 +1,10 @@
 {{- /*
   Displays an internal link without a title
 
-  @params pc  Page context
-  @params sc  Site context
+  @params .  Link.
   */
 -}}
 
-
-<!-- Validation -->
-
-{{- if ( not ( isset . "sc" ) ) -}}
-  {{- errorf "No site context received" -}}
-{{- end -}}
-
-{{- if ( not ( isset . "pc" ) ) -}}
-  {{- errorf "No page context received (%q)" .sc.Page.File.Dir -}}
-{{- end -}}
-
-
 <!-- Rendering -->
 
 <li><a href="{{ . }}">Link</a></li>
diff --git a/layouts/_partials/single/post-meta/organisations.html b/layouts/_partials/single/post-meta/organisations.html
index de92d67..052657b 100644
--- a/layouts/_partials/single/post-meta/organisations.html
+++ b/layouts/_partials/single/post-meta/organisations.html
@@ -20,7 +20,7 @@
       {{ $matched_organisations := ( union ( union ( where $all_organisations "Title" ( .Title | plainify ) ) ( where $all_organisations "Params.abbreviation" ( .Title | plainify ) ) ) ( where $all_organisations "Params.fka" ( .Title | plainify ) ) ) }}
       {{ with $matched_organisations }}
         {{ range . }}
-          {{ partial "cv/organisation/get-title.html" ( dict "organisation" . "site_redact" $.sc.Site.Params.redact ) .File.Dir }}
+          {{ partial "cv/organisation/get-title.html" ( dict "pc" $.pc "organisation" . "site_redact" $.sc.Site.Params.redact ) .File.Dir }}
         {{ end }}
       {{ else }}
         {{ erroridf "missing-organisation" "Could not find organisation %q (%q)" .Title $.sc.File.Path }}