diff --git a/main/query.py b/main/query.py
index dec5ef69..f48a6b7e 100644
--- a/main/query.py
+++ b/main/query.py
@@ -459,7 +459,7 @@ def build_citation_for_docid(
     ])
     if primary_docid:
         refs = query_suppressing_user_input_error(
-            lambda: search_refs_docids(typeCast(DocID, primary_docid))
+            lambda: search_refs_docids(primary_docid)
         ) or []
 
     composite_item, valid = compose_bibitem(
diff --git a/main/templates/relaton/contributor.html b/main/templates/relaton/contributor.html
index f1dfa735..cf759d7f 100644
--- a/main/templates/relaton/contributor.html
+++ b/main/templates/relaton/contributor.html
@@ -26,7 +26,7 @@
       </a>
     {% endwith %}
   {% elif val.person.name %}
-    {% with link=val|substruct_search_link:'{"contributor": [%s]};as_list=yes;only=person.name.completename.content,person.name.surname.content,person.name.forename[*].content' %}
+    {% with link=val|substruct_search_link:'{"contributor": [%s]};as_list=yes;only=person.name.completename.content,person.name.surname.content,person.name.given.forename[*].content' %}
       <a class="link" href="{{ link }}" title="Individual’s name">
         {% include "relaton/person_name.html" with val=val.person.name %}
       </a>
diff --git a/main/templates/relaton/keyword.html b/main/templates/relaton/keyword.html
index 903462a6..f687302e 100644
--- a/main/templates/relaton/keyword.html
+++ b/main/templates/relaton/keyword.html
@@ -1,5 +1,5 @@
 {% load relaton %}
 {% with link=val|substruct_search_link:'{"keyword": [%s]}' %}
   <a class="link whitespace-nowrap" href="{{ link }}"
-    >{{ val }}</a>
+    >{{ val.content }}</a>
 {% endwith %}
diff --git a/main/templates/relaton/person_name.html b/main/templates/relaton/person_name.html
index e085b720..197c7560 100644
--- a/main/templates/relaton/person_name.html
+++ b/main/templates/relaton/person_name.html
@@ -1,6 +1,6 @@
 {% load common %}
 
-{% with val.surname.content as surname and val.completename.content as fullname and val.forename as given_names and val.initial|as_list as initials %}
+{% with val.surname.content as surname and val.completename.content as fullname and val.given.forename as given_names and val.initial|as_list as initials %}
   {% if fullname %}
     {{ fullname }}
   {% else %}