diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html
index 2505f7e0..9f4bf086 100644
--- a/RIGS/templates/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -1,5 +1,6 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load linkornone from filters %}
+{% load namewithnotes from filters %}
 
 {% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
 
@@ -30,7 +31,7 @@
                         <dd class="col-sm-6">
                             {% if object.person %}
                                 <a href="{% url 'person_detail' object.person.pk %}" class="modal-href">
-                                    {{ object.person }}
+                                    {{ object.person|namewithnotes:'person_detail' }}
                                 </a>
                             {% endif %}
                         </dd>
@@ -51,7 +52,7 @@
                             <dd class="col-sm-6">
                                 {% if object.organisation %}
                                     <a href="{% url 'organisation_detail' object.organisation.pk %}" class="modal-href">
-                                        {{ object.organisation }}
+                                        {{ object.organisation|namewithnotes:'organisation_detail' }}
                                     </a>
                                 {% endif %}
                             </dd>
diff --git a/RIGS/templates/partials/event_details.html b/RIGS/templates/partials/event_details.html
index d7450573..457520d3 100644
--- a/RIGS/templates/partials/event_details.html
+++ b/RIGS/templates/partials/event_details.html
@@ -1,3 +1,4 @@
+{% load namewithnotes from filters %}
 <div class="card card-info">
     <div class="card-header">Event Info</div>
     <div class="card-body">
@@ -6,14 +7,14 @@
             <dd class="col-sm-6">
                 {% if object.venue %}
                     <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                        {{ object.venue }}
+                        {{ object.venue|namewithnotes:'venue_detail' }}
                     </a>
                 {% endif %}
             </dd>
             {% if object.venue %}
             <dt class="col-sm-6">Venue Notes</dt>
             <dd class="col-sm-6">
-                {{ object.venue.notes }}{% if object.venue.three_phase_available %}<br>(Three phase available){%endif%} 
+                {{ object.venue.notes }}{% if object.venue.three_phase_available %}<br>(Three phase available){%endif%}
             </dd>
             {% endif %}