diff --git a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js
index ee33dcc..5a35cde 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js
+++ b/invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/search/components.js
@@ -94,7 +94,7 @@ const Creator = ({creator}) => {
   return (
     <div className="creator">
       <Identifiers creator={creator}/>
-      <span className="text-muted">{creator.name}</span>
+      <span className="text-muted">{creator.person_or_org.name}</span>
     </div>
   );
 };
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
index fc4e087..67decb6 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
@@ -15,7 +15,7 @@
 <a href="{{creators.identifiers.orcid|pid_url('orcid')}}" target="_blank" ><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
 {%- endif %}
 
-<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-toggle="tooltip" title="{{affiliation.name}}" {%- endfor %} {% endif %}>{{creators.name}}</span>
+<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-toggle="tooltip" title="{{affiliation.name}}" {%- endfor %} {% endif %}>{{creators.person_or_org.name}}</span>
 {% if not loop.last %}; {% endif %}
 
 {%- endfor %}