diff --git a/RIGS/templates/event_table.html b/RIGS/templates/event_table.html
index 29ed0e54..d51c8d59 100644
--- a/RIGS/templates/event_table.html
+++ b/RIGS/templates/event_table.html
@@ -1,4 +1,5 @@
 {% load next from filters %}
+{% load namewithnotes from filters %}
 {% comment %}<div class="d-none d-md-block">{% endcomment %}
 <div class="table-responsive">
     <table class="table mb-0">
@@ -52,7 +53,7 @@
                         {{ event.name }}
                     </a>
                     {% if event.venue %}
-                        <small>at {% if event.venue.notes %}{{ event.venue.name }} <a href="{% url 'venue_detail' event.venue.pk %}"><span class="far fa-sticky-note"></span></a>{% else %}{{ event.venue.name }}{% endif %}</small>
+                        <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
                     {% endif %}
                     {% if event.dry_hire %}
                         <span class="badge badge-secondary">Dry Hire</span>
diff --git a/RIGS/templatetags/filters.py b/RIGS/templatetags/filters.py
index d7e4bcf2..eb2b8ccf 100644
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -9,6 +9,7 @@ from django.utils.html import escape
 from RIGS import models
 import json
 from django.template.defaultfilters import yesno, title
+from django.urls import reverse_lazy
 
 register = template.Library()
 
@@ -168,5 +169,14 @@ def yesnoi(boolean, invert=False, autoescape=True):
 
 
 @register.filter
+@stringfilter
 def title_spaced(string):
     return title(string).replace('_', ' ')
+
+
+@register.filter(needs_autoescape=True)
+def namewithnotes(obj, url, autoescape=True):
+    if hasattr(obj, 'notes') and obj.notes is not None and len(obj.notes) > 0:
+        return mark_safe(obj.name + " <a href='{}'><span class='far fa-sticky-note'></span></a>".format(reverse_lazy(url, kwargs={'pk': obj.pk})))
+    else:
+        return obj.name