diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
index e3cbfb84..b2324fc5 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
@@ -15,13 +15,13 @@
          an rdfs:label. So check to see if there's an advisee first. If not, just display the label.  -->
     <#local linkedIndividual>
         <#if statement.advisee??>
-            <a href="${profileUrl(statement.advisee)}" title="advisee label">${statement.adviseeLabel!}</a>,
+            <a href="${profileUrl(statement.uri("advisee"))}" title="advisee label">${statement.adviseeLabel!}</a>,
             <#if statement.degreeLabel??>
                 ${statement.degreeAbbr!statement.degreeLabel!} 
                 <#if statement.dateTimeStart??>&nbsp;candidate,<#else>&nbsp;candidate</#if>
             </#if>
         <#elseif statement.advisoryLabel??>
-            <a href="${profileUrl(statement.advisory)}" title="advisory label">${statement.advisoryLabel!statement.localName}</a>
+            <a href="${profileUrl(statement.uri("advisory"))}" title="advisory label">${statement.advisoryLabel!statement.localName}</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
index dc7aa4d2..1498a97e 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
@@ -16,10 +16,10 @@
 <#macro showAuthorship statement>
     <#local resourceTitle>
         <#if statement.infoResource??>
-            <a href="${profileUrl(statement.infoResource)}"  title="resource name">${statement.infoResourceName}</a>.&nbsp;
+            <a href="${profileUrl(statement.uri("infoResource"))}"  title="resource name">${statement.infoResourceName}</a>.&nbsp;
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.authorship)}" title="missing resource">missing information resource</a>.&nbsp;
+            <a href="${profileUrl(statement.uri("authorship"))}" title="missing resource">missing information resource</a>.&nbsp;
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
index 2e65cd6a..602209c8 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
@@ -15,7 +15,7 @@
  
     <#local linkedIndividual>
         <#if statement.award??>
-            <a href="${profileUrl(statement.award)}" title="award name">${statement.awardLabel!statement.localName}</a>
+            <a href="${profileUrl(statement.uri("award"))}" title="award name">${statement.awardLabel!statement.localName}</a>
         </#if>
     </#local>
 
@@ -29,7 +29,7 @@
 
     <#local conferredByOrg>
         <#if statement.conferredBy?has_content && statement.conferredByLabel?has_content>
-             conferred by <a href="${profileUrl(statement.conferredBy)}" title="conferred by">${statement.conferredByLabel}</a>
+             conferred by <a href="${profileUrl(statement.uri("conferredBy"))}" title="conferred by">${statement.conferredByLabel}</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
index fd20c952..658dbe52 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
@@ -13,7 +13,7 @@
 -->
 
 <#if ! statement.valueStart?? && ! statement.valueEnd?? && ! statement.label?? >
-    <a href="${profileUrl(statement.dateTimeInterval)}" title="incomplete date time">incomplete date/time interval</a>
+    <a href="${profileUrl(statement.uri("dateTimeInterval"))}" title="incomplete date time">incomplete date/time interval</a>
 <#else>
     <#if statement.label??>
         ${statement.label!}
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
index 9bd4d7bb..54813b47 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
@@ -10,7 +10,7 @@
 
 <#-- No core:dateTime data property assigned. Display a link to the core:DateTimeValue object -->
 <#if ! statement.dateTime??>
-    <a href="${profileUrl(statement.dateTimeValue)}" title="incomplete date time">incomplete date/time</a>
+    <a href="${profileUrl(statement.uri("dateTimeValue"))}" title="incomplete date time">incomplete date/time</a>
 <#else>
     ${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!)}
 </#if>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
index 7fde834e..569b8521 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -10,7 +10,7 @@
 
 <#macro showStatement statement>
     <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. -->   
-    <a href="${profileUrl(statement.object)}" title="name">${statement.label!statement.localName!}</a> ${statement.title!statement.type!}
+    <a href="${profileUrl(statement.uri("object"))}" title="name">${statement.label!statement.localName!}</a> ${statement.title!statement.type!}
 </#macro>
 
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index f1507be7..9ea8e181 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -29,10 +29,10 @@
     
     <#local linkedIndividual>
         <#if statement.org??>
-            <a href="${profileUrl(statement.org)}" title="organization name">${statement.orgName}</a>
+            <a href="${profileUrl(statement.uri("org"))}" title="organization name">${statement.orgName}</a>
         <#elseif editable>
             <#-- Show the link to the context node only if the user is editing the page. -->
-            <a href="${profileUrl(statement.edTraining)}" title="missing organization">missing organization</a>
+            <a href="${profileUrl(statement.uri("edTraining"))}" title="missing organization">missing organization</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
index 0560c06f..8ffc351e 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
@@ -16,10 +16,10 @@
 <#macro showRole statement>
     <#local linkedIndividual>
         <#if statement.event1??>
-            <a href="${profileUrl(statement.event1)}" title="event name">${statement.event1Label!statement.event1Name}</a>
+            <a href="${profileUrl(statement.uri("event1"))}" title="event name">${statement.event1Label!statement.event1Name}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.role)}" title="event name">missing event</a>
+            <a href="${profileUrl(statement.uri("role"))}" title="event name">missing event</a>
         </#if>
     </#local>
     
@@ -29,9 +29,9 @@
     
     <#local attendedEvent>
         <#if statement.event2?has_content && statement.event2Label?has_content>
-            at <a href="${profileUrl(statement.event2)}" title="event label">${statement.event2Label}</a>
+            at <a href="${profileUrl(statement.uri("event2"))}" title="event label">${statement.event2Label}</a>
         <#elseif statement.series?has_content && statement.seriesLabel?has_content>
-            at <a href="${profileUrl(statement.series)}" title="event label">${statement.seriesLabel}</a>
+            at <a href="${profileUrl(statement.uri("series"))}" title="event label">${statement.seriesLabel}</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
index 7370a20d..9f15b7b4 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
@@ -16,7 +16,7 @@
 <#macro showRole statement property>
     <#local linkedIndividual>
     		<#if statement?has_content && statement.activity?has_content>
-        	<a href="${profileUrl(statement.activity)}" title="activity name">${statement.activityLabel!statement.activityName}</a>
+        	<a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName}</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
index 661df469..c0693586 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
@@ -15,18 +15,18 @@
 <#macro showRole statement>
     <#local linkedIndividual>
         <#if statement.activity??>
-            <a href="${profileUrl(statement.activity)}" title="activity name">${statement.activityLabel!statement.activityName!}</a>
+            <a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName!}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.role)}" title="missing activity">missing activity</a>
+            <a href="${profileUrl(statement.uri("role"))}" title="missing activity">missing activity</a>
         </#if>
     </#local>
     
     <#local awardOrAdminBy>
         <#if statement.awardedByLabel??>
-            &nbsp;awarded by&nbsp;<a href="${profileUrl(statement.awardedBy)}" title="awarded by">${statement.awardedByLabel!}</a>
+            &nbsp;awarded by&nbsp;<a href="${profileUrl(statement.uri("awardedBy"))}" title="awarded by">${statement.awardedByLabel!}</a>
         <#elseif statement.adminedByLabel??>
-            &nbsp;administered by&nbsp;<a href="${profileUrl(statement.adminedBy)}" title="administered by">${statement.adminedByLabel!}</a>
+            &nbsp;administered by&nbsp;<a href="${profileUrl(statement.uri("adminedBy"))}" title="administered by">${statement.adminedByLabel!}</a>
         </#if>
     </#local>
         
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
index c365f549..41fa39ba 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
@@ -16,10 +16,10 @@
 <#macro showRole statement>
     <#local linkedIndividual>
         <#if statement.presentation??>
-            <a href="${profileUrl(statement.presentation)}" title="presentation name">${statement.presentationLabel!statement.presentationName}</a>
+            <a href="${profileUrl(statement.uri("presentation"))}" title="presentation name">${statement.presentationLabel!statement.presentationName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.role)}" title="missing presentation">missing presentation</a>
+            <a href="${profileUrl(statement.uri("role"))}" title="missing presentation">missing presentation</a>
         </#if>
     </#local>
     
@@ -29,9 +29,9 @@
     
     <#local conference>
         <#if statement.conference?has_content && statement.conferenceLabel?has_content>
-            <a href="${profileUrl(statement.conference)}" title="conference">${statement.conferenceLabel}</a>
+            <a href="${profileUrl(statement.uri("conference"))}" title="conference">${statement.conferenceLabel}</a>
         <#elseif statement.series?has_content && statement.seriesLabel?has_content>
-            <a href="${profileUrl(statement.series)}" title="series">${statement.seriesLabel}</a>
+            <a href="${profileUrl(statement.uri("series"))}" title="series">${statement.seriesLabel}</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
index ff038887..0e83d573 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
@@ -15,10 +15,10 @@
 <#macro showRole statement>
     <#local linkedIndividual>
         <#if statement.activity??>
-            <a href="${profileUrl(statement.activity)}" title="activity name">${statement.activityLabel!statement.activityName}</a>
+            <a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.role)}" title="missing activity">missing activity</a>
+            <a href="${profileUrl(statement.uri("role"))}" title="missing activity">missing activity</a>
         </#if>
     </#local>
     
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
index fad2c364..ac280fda 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
@@ -14,9 +14,9 @@
      next statement -->
 <#macro showAuthorship statement>
     <#if statement.person??>
-        <a href="${profileUrl(statement.person)}" title="author name">${statement.personName}</a>
+        <a href="${profileUrl(statement.uri("person"))}" title="author name">${statement.personName}</a>
     <#else>
         <#-- This shouldn't happen, but we must provide for it -->
-        <a href="${profileUrl(statement.authorship)}" title="missing author">missing author</a>
+        <a href="${profileUrl(statement.uri("authorship"))}" title="missing author">missing author</a>
     </#if>
 </#macro>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
index 99914acb..f0273306 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
@@ -17,12 +17,12 @@
         <#-- until the custom form is ready, provide a link to the address profile for editing --> 
         <div class="adr">
             <#if statement.street1?has_content>
-                <div class="address-street1"><a href="${profileUrl(statement.address)}">${statement.street1}</a></div>
+                <div class="address-street1"><a href="${profileUrl(statement.uri("address"))}">${statement.street1}</a></div>
             </#if>
             
             <#if statement.street2?has_content>
                 <#if !statement.street1?has_content>
-                    <div class="address-street2"><a href="${profileUrl(statement.address)}">${statement.street2}</a></div>
+                    <div class="address-street2"><a href="${profileUrl(statement.uri("address"))}">${statement.street2}</a></div>
                 <#else>
                     <div class="address-street2">${statement.street2}</div>
                 </#if>
@@ -30,7 +30,7 @@
             
             <#if statement.street3?has_content>
                 <#if !statement.street1?has_content && !statement.street2?has_content>
-                    <div class="address-street3"><a href="${profileUrl(statement.address)}">${statement.street3}</a></div>
+                    <div class="address-street3"><a href="${profileUrl(statement.uri("address"))}">${statement.street3}</a></div>
                 <#else>
                     <div class="address-street3">${statement.street3}</div>
                 </#if>
@@ -64,7 +64,7 @@
     <#elseif statement.editable>
         <#-- This can be removed when the custom form is available. Until then, provide a link to the
              address profile so the data can be edited. -->
-        <a href="${profileUrl(statement.address)}" title="address label">${statement.label!statement.localName}</a>
+        <a href="${profileUrl(statement.uri("address"))}" title="address label">${statement.label!statement.localName}</a>
     <#else>
         ${statement.label!}
     </#if>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
index 87439d07..bec9ec01 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
@@ -17,10 +17,10 @@
     
     <#local linkedIndividual>
         <#if statement.person??>
-            <a href="${profileUrl(statement.person)}" title="person name">${statement.personName}</a>
+            <a href="${profileUrl(statement.uri("person"))}" title="person name">${statement.personName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.position)}" title="missing person">missing person in this position</a>
+            <a href="${profileUrl(statement.uri("position"))}" title="missing person">missing person in this position</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
index f29bac44..e26bcf57 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
@@ -17,10 +17,10 @@
     
     <#local linkedIndividual>
         <#if statement.person??>
-            <a href="${profileUrl(statement.person)}" title="person name">${statement.personName}</a>
+            <a href="${profileUrl(statement.uri("person"))}" title="person name">${statement.personName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.training)}" title="missing person">missing person in this position</a>
+            <a href="${profileUrl(statement.uri("training"))}" title="missing person">missing person in this position</a>
         </#if>
     </#local>
     <#local detailedInfo>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
index 0b95519c..43594c5d 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
@@ -17,17 +17,17 @@
     
     <#local linkedIndividual>
         <#if statement.org??>
-            <a href="${profileUrl(statement.org)}" title="organization name">${statement.orgName}</a>
+            <a href="${profileUrl(statement.uri("org"))}" title="organization name">${statement.orgName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.position)}" title="missing organization">missing organization</a>
+            <a href="${profileUrl(statement.uri("position"))}" title="missing organization">missing organization</a>
         </#if>
     </#local>
     <#-- The sparql query returns both the org's parent (middleOrg) and grandparent (outerOrg).
          For now, we are only displaying the parent in the list view. -->
     <#local middleOrganization>
         <#if statement.middleOrg??>
-            <a href="${profileUrl(statement.middleOrg)}" title="middle organization">${statement.middleOrgName!}</a>
+            <a href="${profileUrl(statement.uri("middleOrg"))}" title="middle organization">${statement.middleOrgName!}</a>
         </#if>
     </#local>
     
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
index a3f04891..c9c946e1 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -18,10 +18,10 @@
   
     <#local linkedIndividual>
         <#if statement.indivInRole??>
-            <a href="${profileUrl(statement.indivInRole)}" title="name">${statement.indivLabel!statement.indivName}</a>
+            <a href="${profileUrl(statement.uri("indivInRole"))}" title="name">${statement.indivLabel!statement.indivName}</a>
         <#else>
             <#-- This shouldn't happen, but we must provide for it -->
-            <a href="${profileUrl(statement.role)}"  title="missing person">missing person in this role</a>
+            <a href="${profileUrl(statement.uri("role"))}"  title="missing person">missing person in this role</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
index 57f486a9..b1515f73 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
@@ -16,5 +16,5 @@
 <#if statement.url?has_content>
     <a href="${statement.url}" title="link text">${linkText}</a> 
 <#else>
-    <a href="${profileUrl(statement.link)}" title="link name">${statement.linkName}</a> (no url provided for link)
+    <a href="${profileUrl(statement.uri("link"))}" title="link name">${statement.linkName}</a> (no url provided for link)
 </#if>
\ No newline at end of file