diff --git a/webapp/languages/example/i18n/all_es.properties b/webapp/languages/example/i18n/all_es.properties
index 0cfe0d066..cd10aabcb 100644
--- a/webapp/languages/example/i18n/all_es.properties
+++ b/webapp/languages/example/i18n/all_es.properties
@@ -223,8 +223,8 @@ insufficient_authorization = Lo sentimos, pero no est√° autorizado para ver l
 #
 # "partial" individual templates ( /templates/freemarker/body/partials/individual ) 
 #
-manage_publications = gestionar las publicaciones
-manage_grants_and_projects = gestión de subvenciones y proyectos
+manage_publications_link = gestionar las publicaciones
+manage_grants_and_projects_link = gestión de subvenciones y proyectos
 manage_affiliated_people_link = gestión de personas afiliadas
 
 group_name = Nombre del grupo
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 2817af838..e7239855e 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -232,8 +232,8 @@ insufficient_authorization = We're sorry, but you are not authorized to view the
 #
 # "partial" individual templates ( /templates/freemarker/body/partials/individual )
 #
-manage_publications = manage publications
-manage_grants_and_projects = manage grants & projects
+manage_publications_link = manage publications
+manage_grants_and_projects_link = manage grants & projects
 manage_affiliated_people_link = manage affiliated people
 
 group_name = group name
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index 9854636bb..d2e5fbc5d 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -3,22 +3,29 @@
 <#-- Template for property listing on individual profile page -->
 
         <#list group.properties as property>
+            <#assign rangeClass = "noRangeClass">
+            <#if property.rangeUri?has_content && property.rangeUri?contains("#")>
+                <#assign rangeClass = property.rangeUri?substring(property.rangeUri?last_index_of("#")+1)>
+            <#elseif property.rangeUri?has_content >
+                <#assign rangeClass = property.rangeUri?substring(property.rangeUri?last_index_of("/")+1)>
+            </#if>
+        
             <article class="property" role="article">
                 <#-- Property display name -->
-                <#if property.localName == "authorInAuthorship" && editable  >
-                    <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                        <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications}" <#if verbose>style="padding-top:10px"</#if> >
-                            ${i18n().manage_publications}
+                <#if rangeClass == "Authorship" && editable  >
+                    <h3 id="${property.localName}-${rangeClass}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                        <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications_link}" <#if verbose>style="padding-top:10px"</#if> >
+                            ${i18n().manage_publications_link}
                         </a>
                     </h3>
-                <#elseif property.localName == "hasResearcherRole" && editable  >
-                    <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                        <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="${i18n().manage_grants_and_projects}" <#if verbose>style="padding-top:10px"</#if> >
-                            ${i18n().manage_grants_and_projects}
+                <#elseif rangeClass == "ResearcherRole" && editable  >
+                    <h3 id="${property.localName}-${rangeClass}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                        <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="${i18n().manage_grants_and_projects_link}" <#if verbose>style="padding-top:10px"</#if> >
+                            ${i18n().manage_grants_and_projects_link}
                         </a>
                     </h3>
-                <#elseif property.localName == "organizationForPosition" && editable  >
-                    <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                <#elseif rangeClass == "Position" && editable  >
+                    <h3 id="${property.localName}-${rangeClass}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
                         <a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="${i18n().manage_affiliated_people}" <#if verbose>style="padding-top:10px"</#if> >
                             ${i18n().manage_affiliated_people_link}
                         </a>
@@ -27,13 +34,13 @@
                     <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
                 </#if>
                 <#-- List the statements for each property -->
-                <ul class="property-list" role="list" id="${property.localName}List">
+                <ul class="property-list" role="list" id="${property.localName}-${rangeClass}-List">
                     <#-- data property -->
                     <#if property.type == "data">
                         <@p.dataPropertyList property editable />
                     <#-- object property -->
                     <#else>
-                        <@p.objectProperty property editable />
+                        <@p.objectProperty property editable /> 
                     </#if>
                 </ul>
             </article> <!-- end property -->
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index 3ba46792b..c54bd9b16 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -114,7 +114,7 @@ name will be used as the label. -->
 </#macro>
 
 <#macro showAddLink propertyLocalName propertyName label url>
-    <#if propertyName == "informationResourceInAuthorship" || propertyName == "webpage" || propertyLocalName == "hasResearchArea">
+    <#if propertyName == "authors" || propertyName == "webpage" || propertyLocalName == "hasResearchArea">
         <a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}">
         <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
     <#else>