diff --git a/layouts/partials/shortcodes/image.html b/layouts/partials/shortcodes/image.html
index 642d6f3814..ff3fd920f5 100644
--- a/layouts/partials/shortcodes/image.html
+++ b/layouts/partials/shortcodes/image.html
@@ -17,24 +17,22 @@
 {{- $width := "auto" }}
 {{- $dest_url := urls.Parse $url }}
 {{- $dest_path := $dest_url.Path }}
-{{- $image := $page.Resources.GetMatch (path.Clean $dest_url.Path) }}
-{{- if not $image }}
-  {{- $image = .Resources.GetMatch $dest_path }}
-{{- end }}
-{{- if not $image }}
-  {{- $image = .Resources.GetRemote $url }}
-{{- end }}
-{{- if $image }}
-  {{- $url = $image.RelPermalink }}
-  {{- if $dest_url.RawQuery }}
-    {{- $url = printf "%s?%s" $url $dest_url.RawQuery }}
+{{- $image := "" }}
+{{- if not $dest_url.IsAbs }}
+  {{- with or ($page.Resources.Get $dest_url.Path) (resources.Get $dest_url.Path) }}
+    {{- $image = . }}
   {{- end }}
-{{- end }}
-{{- if and (not $image) (not $dest_url.IsAbs) }}
-  {{- if eq $page.Site.Params.image.errorlevel "warning" }}
-    {{- warnf "%q: image '%s' is not a resource but linked anyways" $page.File.Filename .url }}
-  {{- else if eq $page.Site.Params.image.errorlevel "error" }}
-    {{- errorf "%q: image '%s' is not a resource" $page.File.Filename .url }}
+  {{- with $image }}
+    {{- $url = $image.RelPermalink }}
+    {{- with $dest_url.RawQuery }}
+      {{- $url = printf "%s?%s" $url . }}
+    {{- end }}
+  {{- else }}
+    {{- if eq $page.Site.Params.image.errorlevel "warning" }}
+      {{- warnf "%q: image '%s' is not a resource but linked anyways" $page.File.Filename .url }}
+    {{- else if eq $page.Site.Params.image.errorlevel "error" }}
+      {{- errorf "%q: image '%s' is not a resource" $page.File.Filename .url }}
+    {{- end }}
   {{- end }}
 {{- end }}
 {{- if $dest_url.RawQuery }}
diff --git a/layouts/partials/shortcodes/link.html b/layouts/partials/shortcodes/link.html
index 2fdf885cfd..a60dc19166 100644
--- a/layouts/partials/shortcodes/link.html
+++ b/layouts/partials/shortcodes/link.html
@@ -16,7 +16,6 @@
 {{- $u := urls.Parse $url }}
 {{- $href := $u.String }}
 {{- $path := $u.Path }}
-{{- $linkPage := "" }}
 {{- if $u.IsAbs }}
   {{- $target = "_blank" }}
   {{- if isset $page.Site.Params "externallinktarget" }}
@@ -24,6 +23,7 @@
   {{- end }}
   {{- $attributes = $attributes | merge (dict "target" $target) }}
 {{- else }}
+  {{- $linkPage := "" }}
   {{- if $path }}
     {{- with or
       ($page.Page.GetPage $path)