diff --git a/hs/Main.hs b/hs/Main.hs
index d8a31dc7..93edcb47 100644
--- a/hs/Main.hs
+++ b/hs/Main.hs
@@ -164,8 +164,8 @@ main = do
         >>= readMarkdownWith siteReaderOptions
         <&> writeHTML5With siteWriterOptions
         >>= saveSnapshot "content"
-        >>= loadAndApplyTemplate "templates/page.html"    siteContext
-        >>= loadAndApplyTemplate "templates/default.html" siteContext
+        >>= loadAndApplyTemplate "templates/page.html"    siteSectionContext
+        >>= loadAndApplyTemplate "templates/default.html" siteSectionContext
         >>= relativizeUrls
 
   -- Build compiler for literate Agda pages
@@ -176,8 +176,8 @@ main = do
         >>= readMarkdownWith siteReaderOptions
         <&> writeHTML5With siteWriterOptions
         >>= saveSnapshot "content"
-        >>= loadAndApplyTemplate "templates/page.html"    siteContext
-        >>= loadAndApplyTemplate "templates/default.html" siteContext
+        >>= loadAndApplyTemplate "templates/page.html"    siteSectionContext
+        >>= loadAndApplyTemplate "templates/default.html" siteSectionContext
         >>= relativizeUrls
 
   -- Run Hakyll
diff --git a/templates/head.html b/templates/head.html
index 77142c4e..e415c68d 100755
--- a/templates/head.html
+++ b/templates/head.html
@@ -3,7 +3,11 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="/public/css/style.css">
-  <title>$pagetitle$</title>
+  $if(titlerunning)$
+  <title>$pagetitle$ – $titlerunning$</title>
+  $else$
+  <title>$pagetitle$ – $title$</title>
+  $endif$
   $if(google-analytics)$
   $partial("templates/google-analytics.html")$
   $endif$