diff --git a/elections2021/templates/elections2021/_candidate_list_item.html b/elections2021/templates/elections2021/_candidate_list_item.html
index f024406979bef516858741b48d715c001ff93617..7647a45ad5940d6270effb34714a38e3762f1a53 100644
--- a/elections2021/templates/elections2021/_candidate_list_item.html
+++ b/elections2021/templates/elections2021/_candidate_list_item.html
@@ -5,7 +5,15 @@
     {% image candidate.photo fill-100x100 %}
   </div>
   <div class="candidate-table-row__name head-heavy-2xs font-bold">{{ candidate.title }}</div>
-  <div class="candidate-table-row__bio font-condensed">{{ candidate.age }} let, {{ candidate.occupation }}, {{ candidate.city }}</div>
+  <div class="candidate-table-row__bio font-condensed">
+    {% if candidate.age %}
+      {{ candidate.age }}&nbsp;let{% if candidate.job or candidate.city %},{% endif %}
+    {% endif %}
+    {% if candidate.job %}
+     {{ candidate.job }}{% if candidate.city %},{% endif %}
+    {% endif %}
+    {% if candidate.city %}{{ candidate.city }}{% endif %}
+  </div>
   <div class="candidate-table-row__affiliation">
     <div class="w-6 mr-2">
       {% if candidate.is_pirate %}
diff --git a/shared/templates/shared/blocks/compact_candidate_snippet_block.html b/shared/templates/shared/blocks/compact_candidate_snippet_block.html
index acd2bb8553e92cbaade47c953972e3de6acbeb25..dbcedfc687bb378512389b59557f79e0f9306f32 100644
--- a/shared/templates/shared/blocks/compact_candidate_snippet_block.html
+++ b/shared/templates/shared/blocks/compact_candidate_snippet_block.html
@@ -19,13 +19,14 @@
     {{ block.title }}
   </div>
   <div class="candidate-table-row__bio font-condensed">
-    {% if person_page.age %}
-      {{ person_page.age }}&nbsp;let{% if person_page.job or person_page.city %},{% endif %}
+    <div class="candidate-table-row__bio font-condensed">
+    {% if block.age %}
+      {{ block.age }}&nbsp;let{% if block.job or block.city %},{% endif %}
     {% endif %}
-    {% if person_page.job %}
-     {{ person_page.job }}{% if person_page.city %},{% endif %}
+    {% if block.job %}
+     {{ block.job }}{% if block.city %},{% endif %}
     {% endif %}
-    {% if person_page.city %}{{ person_page.city }}{% endif %}
+    {% if block.city %}{{ block.city }}{% endif %}
   </div>
   <div class="candidate-table-row__affiliation">
     <div class="flex items-center">