diff --git a/app/views/content/display/attribute_value/_link.html.erb b/app/views/content/display/attribute_value/_link.html.erb
index e19b6a77..19ea5ad2 100644
--- a/app/views/content/display/attribute_value/_link.html.erb
+++ b/app/views/content/display/attribute_value/_link.html.erb
@@ -1,27 +1,18 @@
-
-
 <% value.each do |link_code| %>
   <% 
     klass, id = link_code.split('-')
   %>
   <div class="chip js-load-page-name" data-klass="<%= klass %>" data-id="<%= id %>">
-    <%= link_to content_class_from_name(klass) do %>
+    <%= link_to send("#{klass.downcase}_path", id) do %>
       <span class="<%= content_class_from_name(klass).color %>-text">
         <i class="material-icons left">
           <%= content_class_from_name(klass).icon %>
         </i>
       </span>
       <span class="name-container">
-        <%= id %>
+        <em>Loading <%= klass %></em>
       </span>
     <% end %>
   </div>
 <% end %>
-<br/><br/>
-
-<%#
-  simple_format ContentFormatterService.show(
-    text:         value.map { |link_code| "[[#{link_code}]]"}.join("\n"),
-    viewing_user: current_user
-  )
-%>
+<br/><br/>
\ No newline at end of file