diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a201d40..94b68dc 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -16,12 +16,14 @@
   <span><a href="{{ .Permalink }}">#{{ .LinkTitle }}</a></span>
   {{- end }}
 
+  {{- with (.Resources.GetMatch "featured") }}
   {{- partial "image.html"
      (dict
-      "image" (.Resources.GetMatch "featured")
-      "alt" .Params.featured.alt
+      "image" .
+      "alt" .Params.alt
       "sizes" (slice 320 480 600 800)
       "classes" (slice "shadow" "featured")) }}
+  {{- end }}
   {{ .Content }}
   <section class="article-group author-articles">
   {{- range .Data.Pages }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 27a1195..fdffc0b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -16,13 +16,14 @@
   <span><a href="{{ .Permalink }}">#{{ .LinkTitle }}</a></span>
   {{- end }}
 
+  {{- with (.Resources.GetMatch "featured") }}
   {{- partial "image.html"
      (dict
-      "image" (.Resources.GetMatch "featured")
-      "alt" .Params.featured.alt
+      "image" .
+      "alt" .Params.alt
       "sizes" (slice 320 480 600 800)
       "classes" (slice "shadow" "featured")) }}
-
+  {{- end }}
   {{ .Content }}
   {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
 {{ end }}
diff --git a/layouts/authors/terms.html b/layouts/authors/terms.html
index f4f81a9..b1731ef 100644
--- a/layouts/authors/terms.html
+++ b/layouts/authors/terms.html
@@ -2,13 +2,20 @@
 <section>
     <h1 class="center-text">Authors</h1>
 	{{- range .Data.Pages }}
+
+      {{- $title := .Params.name }}
+      {{- $summary := .Params.bio }}
+
+      {{- with (.Resources.GetMatch "avatar") }}
       {{- partial "article-alt.html"
         (dict
-          "image" (.Resources.GetMatch "avatar")
+          "image" .
           "alt" .Params.alt
-          "title" .Params.name
-          "summary" .Params.bio
+          "title" $title
+          "summary" $summary
           "url" (printf "/%s/%s" "authors" (.Params.name | urlize))) }}
+      {{- end }}
+
 	{{- end }}
 </section>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/article.html b/layouts/partials/article.html
index 570371e..eac990a 100644
--- a/layouts/partials/article.html
+++ b/layouts/partials/article.html
@@ -1,10 +1,8 @@
-{{- $alt := .Params.featured.alt }}
-{{- $img := .Resources.GetMatch "featured" }}
 <article class="index float-on-hover shadow">
     <a href=" {{ .Permalink }}">
-        {{- with $img }}
+        {{- with (.Resources.GetMatch "featured") }}
         {{- $resized := .Resize "256x webp q90" }}
-        <img src={{ $resized.RelPermalink }} alt="{{ $alt }}">
+        <img src={{ $resized.RelPermalink }} alt="{{ .Params.alt }}">
         {{- end }}
     <h3 class="title">{{ .Title | markdownify }}</h3>
     </a>