diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig
index 3607391f..5139f625 100644
--- a/source/_partials/talk_listing_item.twig
+++ b/source/_partials/talk_listing_item.twig
@@ -1,17 +1,24 @@
-<li>{% spaceless %}
+<li>
     <strong>
-        {% if not talk.fuzzy_date %}
-            {{ talk.date|date('jS F') }}
-        {% else %}
+        {% if talk.fuzzy_date %}
             {{ talk.date|date('F') }}
+        {% else %}
+            {{ talk.date|date('jS F') }}
         {% endif %}
     </strong> -
-        {% if talk.location_link %}<a href="{{ talk.location_link }}">{% endif %}
-            {{ talk.location }}
-        {% if talk.location_link %}</a>{% endif %}
-    - {% if talk.title_link %}<a href="{{ talk.title_link }}">{% endif %}
-        {{ talk.title }}
-    {% if talk.title_link %}</a>{% endif %}
-
-    {{ talk.title_suffix }}
-{% endspaceless %}</li>
+    {% if talk.location_link %}
+        <a href="{{ talk.location_link }}">
+    {% endif %}
+    {{ talk.location }}
+    {% if talk.location_link %}
+        </a>
+    {% endif %}
+    -
+    {% if talk.title_link %}
+        <a href="{{ talk.title_link }}">
+    {% endif %}
+    {{ talk.title }}
+    {% if talk.title_link %}
+        </a>
+    {% endif %}
+</li>