diff --git a/editions/tw5.com/tiddlers/system/Sources.tid b/editions/tw5.com/tiddlers/system/Sources.tid
index e0c331d78..eec21b82f 100644
--- a/editions/tw5.com/tiddlers/system/Sources.tid
+++ b/editions/tw5.com/tiddlers/system/Sources.tid
@@ -2,27 +2,36 @@ title: $:/editions/tw5.com/TiddlerInfo/Sources
 tags: $:/tags/TiddlerInfo
 caption: Sources
 
-\define makeStaticLink()
-http://tiddlywiki.com/static/<$view tiddler=<<currentTiddler>> field="title" format="doubleurlencoded"/>.html
+\define static-link-base()
+http://tiddlywiki.com/static/$(title)$.html
 \end
-\define outerMakeStaticLink()
-<$macrocall $name="makeStaticLink" $output="text/plain"/>
-\end
-\define makeGitHubLink()
-https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$(githubLink)$
-\end
-\define outerMakeGitHubLink()
-<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}>
-<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<makeGitHubLink>>/></a>
+
+\define make-static-link()
+<$set name="title" filter="[<currentTiddler>encodeuricomponent[]encodeuricomponent[]]" select="0">
+<a href=<<static-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<static-link-base>>/></a>
 </$set>
 \end
+
+\define github-link-base()
+https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$(title)$
+\end
+
+\define make-github-link()
+<$set name="title" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}>
+<$set name="title" filter="[<title>encodeuricomponent[]]" select="0">
+<a href=<<github-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<github-link-base>>/></a>
+</$set>
+</$set>
+\end
+
 <$list filter="[all[current]!is[system]!is[shadow]]">
 
 A static HTML representation of this tiddler is available at the URL:
 
-* <<outerMakeStaticLink>>
+* <<make-static-link>>
 
 Help us to improve the documentation by sending a ~GitHub pull request for this tiddler:
 
-* <<outerMakeGitHubLink>>
-</$list>
\ No newline at end of file
+* <<make-github-link>>
+
+</$list>