diff --git a/content/LICENSE.md b/content/LICENSE.md
index 7404596e..f3914097 100644
--- a/content/LICENSE.md
+++ b/content/LICENSE.md
@@ -1,4 +1,5 @@
 ---
+title: Site content licence
 type: timeless
 _build:
   list: never
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index c147c733..6e600c2c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -22,7 +22,7 @@
                         <li class="post-item">
                             <a href="{{.Permalink}}">
                                 {{ if .Params.emoji }}<span class="post-emoji">{{ .Params.emoji }}</span>{{ end }}
-                                <span class="post-title">{{ if .Title }}{{.Title}}{{ else }}<i>Untitled post</i>{{ end }}</span>
+                                <span class="post-title">{{ if .Title }}{{.Title}}{{ else }}<i>Untitled {{ .Type | singularize -}}</i>{{ end }}</span>
                                 <span class="post-day">
                                     {{ if .Site.Params.dateformShort }}
                                         {{ .Date.Format .Site.Params.dateformShort }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 8a10f8cb..601e35ed 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -11,16 +11,15 @@
 <link rel="authorization_endpoint" href="https://indieauth.com/auth" />
 <link rel="token_endpoint" href="https://tokens.indieauth.com/token" />
 <link rel="webmention" href="https://webmention.io/www.byjp.me/webmention" />
-
-{{ block "title" . }}
+{{ block "title" . -}}
     <title>
-        {{ if .IsHome }}
-            {{ $.Site.Title }}
-        {{ else }}
-        {{if .Title }}{{ .Title }}{{ else }}Untitled post{{ end }}, {{ $.Site.Title }}
-        {{ end }}
+        {{- if .IsHome -}}
+            {{- $.Site.Title -}}
+        {{- else -}}
+            {{- if .Title -}}{{- .Title -}}{{- else -}}Untitled {{ $.Type | singularize -}}{{- end -}}, {{ $.Site.Title -}}
+        {{- end -}}
     </title>
-{{ end }}
+{{- end }}
 
 <!-- CSS -->
 {{/*  <link href="/css/flags.css" rel="stylesheet" type="text/css">  */}}