diff --git a/content/session/assistingpeopleinisolation.md b/content/session/assistingpeopleinisolation.md
index 60c3418..bd9de2c 100644
--- a/content/session/assistingpeopleinisolation.md
+++ b/content/session/assistingpeopleinisolation.md
@@ -4,7 +4,7 @@ title: "How to assist people in home isolation"
 
 Drafted by the [Pirate Care Syllabus](http://syllabus.pirate.care/) crew. Last edit: March 14, 9pm CST.
 
-Document available also in Croatian: ![](session:hr.assistingpeopleinisolation).
+Document available also in Croatian: ![](session:hr.assistingpeopleinisolation.md).
 
 # Examples of communities organising assistance
 
diff --git a/content/session/kidsinquarantine.md b/content/session/kidsinquarantine.md
index 0e42f54..9059080 100644
--- a/content/session/kidsinquarantine.md
+++ b/content/session/kidsinquarantine.md
@@ -1,7 +1,7 @@
 ---
 title: "Kids in quarantine"
 ---
-This document has an Italian version: ![](session:it.kidsinquarantine).
+This document has an Italian version: ![](session:it.kidsinquarantine.md).
 
 # Crisis of domesticity
 
@@ -57,4 +57,4 @@ For teenagers, things are more complex, because they can use different kinds of
 # Further reading / resources
 - [Here’s The Entire List of Education Companies Offering Free Subscriptions Due to School Closings](https://kidsactivitiesblog.com/135609/list-of-education-companies-offering-free-subscriptions/?fbclid=IwAR1f2-K7TQ_cc57bgvdrPGIUytaeyt4VISRn2c98dg_gFHYU0cokZCMfQuQ)
 - [Over 30 Virtual Field Trips with Links](https://docs.google.com/document/d/1SvIdgTx9djKO6SjyvPDsoGlkgE3iExmi3qh2KRRku_w/preview?pru=AAABcQilkkk%2ADtHGT1eJMgvNOIRBbFig8A&fbclid=IwAR01IimhN9-qgbPPvC6dZT7Hc6uOEDm4ah5Jtx3CtM-6sem57FFpl7FbUx0)
-- [Skype a Scientist](https://www.skypeascientist.com/)
\ No newline at end of file
+- [Skype a Scientist](https://www.skypeascientist.com/)
diff --git a/content/topic/coronanotes.md b/content/topic/coronanotes.md
index 28713ef..db8dc5d 100644
--- a/content/topic/coronanotes.md
+++ b/content/topic/coronanotes.md
@@ -68,7 +68,7 @@ The challenge today and in the next period of time is and will be how to keep th
 
 In this topic we address what are the immediate ways to attend to the critical care needs that distancing, isolation and quarantine are introducing or making worse and that we can address in a collective and mutualist manner. These are the notes documenting interventions and practices in response to the Coronavirus pandemic:
 
-- ![](session:assistingpeopleinisolation) (and in Croatian ![](session:hr.assistingpeopleinisolation))
+- ![](session:assistingpeopleinisolation) (and in Croatian ![](session:hr.assistingpeopleinisolation.md))
 
 - ![](session:throughafeministlense)
 
diff --git a/themes/piratecare/layouts/_default/_markup/render-image.html b/themes/piratecare/layouts/_default/_markup/render-image.html
index a590de9..2bffdd0 100644
--- a/themes/piratecare/layouts/_default/_markup/render-image.html
+++ b/themes/piratecare/layouts/_default/_markup/render-image.html
@@ -16,9 +16,9 @@
     {{ if $.Page.Site.GetPage $s_destination }}
         {{ $session := $.Page.Site.GetPage $s_destination }}
         {{ if not $text_link }}
-            <a href="{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $session.Title}} title="{{ $session.Title }}"{{ end }}>{{ $session.Title }}</a>
+            <a href="{{ $session.RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $session.Title}} title="{{ $session.Title }}"{{ end }}>{{ $session.Title }}</a>
         {{ else }}
-            <a href="{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
+            <a href="{{ $session.RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
         {{ end }}
     {{ else }}
             <a href="{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $text_link }}⦚<span class="text-xs font-bold p-1 bg-AuChico text-CoconutCream">session:{{ $s_destination }} not found</span></a>
@@ -28,9 +28,9 @@
     {{ if $.Page.Site.GetPage $t_destination }}
         {{ $topic := $.Page.Site.GetPage $t_destination }}
         {{ if not $text_link }}
-            <a href="{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $topic.Title}} title="{{ $topic.Title }}"{{ end }}>{{ $topic.Title }}</a>
+            <a href="{{ $topic.RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $topic.Title}} title="{{ $topic.Title }}"{{ end }}>{{ $topic.Title }}</a>
         {{ else }}
-            <a href="{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
+            <a href="{{ $topic.RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
         {{ end }}
     {{ else }}
             <a href="{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $text_link }}⦚<span class="text-xs font-bold p-1 bg-AuChico text-CoconutCream">topic:{{ $t_destination }} not found</span></a>