diff --git a/layouts/sessions/list.html b/layouts/sessions/list.html
index a829538..cc39d15 100644
--- a/layouts/sessions/list.html
+++ b/layouts/sessions/list.html
@@ -5,7 +5,7 @@
 <section>
 	<ul class="talks">
 		{{ $sessions := where .Site.AllPages ".Section" "sessions" }}
-		{{ $types := (slice "conference" "quickie" "keynote") }}
+		{{ $types := (slice "talk" "short-talk" "opening") }}
 		{{ range sort $sessions ".Title" }}
 		{{ if intersect (slice .Params.format) $types }}
 		<li class="talk tag-{{ anchorize (delimit (.Params.tags | default (slice)) "" ) }}">{{ partial "session.html" . }}</li>
diff --git a/layouts/sessions/single.html b/layouts/sessions/single.html
index b7839da..97bc0d7 100644
--- a/layouts/sessions/single.html
+++ b/layouts/sessions/single.html
@@ -22,8 +22,8 @@
 			<ul class="speakers">
 				{{ range where .Site.RegularPages "Params.key" "in" .Params.speakers }}
 				<li>
-					<a class="visually-hidden" aria-hidden="true" href="/speakers/{{ .Params.key }}">{{ .Params.name }}</a>
-					<a class="speaker" href="/speakers/{{ .Params.key }}">
+					<a class="visually-hidden" aria-hidden="true" href="/2021/speakers/{{ .Params.key }}">{{ .Params.name }}</a>
+					<a class="speaker" href="/2021/speakers/{{ .Params.key }}">
 						<div class="speaker-img" style="background-image: url({{ .Params.photoURL }});"></div>
 						<strong class="speaker-name">{{ .Params.name }}</strong>
 						<span class="speaker-country">{{ .Params.city }}</span>