diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
index c299ed7..5fdfe68 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
@@ -70,7 +70,7 @@
 
         <h4>
           <a href="{{ record_url }}">
-            {{r.metadata.titles[0].title}}
+            {{r.metadata.title}}
           </a>
         </h4>
 
@@ -80,7 +80,7 @@
 
         <p class="hidden-xs">
           <a href="{{record_url}}">
-            {{ r.metadata.descriptions[0].description | striptags | truncate(300) }}
+            {{ r.metadata.description | striptags | truncate(300) }}
           </a>
         </p>
 
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 ecfe24d..5253eb9 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
@@ -12,8 +12,8 @@
 
 {%- for creators in authors_list %}
 
-{%- if creators.identifiers.Orcid %}
-<a href="{{creators.identifiers.Orcid|pid_url('orcid')}}" target="_blank" ><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
+{%- if creators.identifiers.orcid %}
+<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>
@@ -25,7 +25,7 @@
 <!--TODO: contributers-->
 {%- macro contributors(contributors_list) %}
 {%- for group in contributors_list|groupby('type')%}
-<h5>{{group.grouper|contributortype_title}}(s)</h5>
+<h5>{{group.grouper}}(s)</h5>
 {{authors(group.list)}}
 {%- endfor %}
 {%- endmacro %}
\ No newline at end of file