diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index ca04cf9e30..d1298d0360 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -32,7 +32,7 @@
 <ul class="columnize">
   {{- end }}
   {{- $c:=""}}{{/* display terms of a taxonomy */}}
-  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Term.Page) }}">{{ .Title }}</a> ({{ .Len }})</li>
+  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Page.Page) }}">{{ .Title }}</a> ({{ .Len }})</li>
   {{- $lastCapital = $capital }}
 {{- end }}
 {{- if ne $lastCapital "" }}
diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
index b088c8d556..4906d6814b 100644
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@@ -14,7 +14,7 @@
 {{- $breadcrumb := slice }}
 {{- range seq $depth }}
   {{- if $to }}
-    {{- if (default $to.Data.Term $to.Title) }}
+    {{- if or $to.Title (eq $to.Kind "taxonomy") (eq $to.Kind "term") }}
       {{- $breadcrumb = $breadcrumb | append $to }}
     {{- end }}
   {{- else }}
@@ -33,11 +33,11 @@
   {{- $depth = add $depth 1 }}
   {{- $title := $to.Title }}
   {{- if eq $to.Kind "taxonomy" }}
-    {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
+    {{- $title = default (default $to.Data.Plural (i18n $to.Data.Plural)) .Title }}
   {{- else if eq $to.Kind "term" }}
-    {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
-    {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
-    {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (default $to.Data.Term $to.Title) }}
+    {{- $taxonomy_page := $to.Site.GetPage $to.Data.Plural }}
+    {{- $title = default (default $to.Data.Singular (i18n $to.Data.Singular)) $taxonomy_page.Params.SingularTitle }}
+    {{- $title = printf "%s %s %s" $title (default "::" $to.Site.Params.titleSeparator) (default $to.Data.Term $to.Title) }}
   {{- end }}
   {{- if not $title }}
     {{- $title = $to.Site.Title }}