diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index aebf49ab..ef18e98b 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -41,7 +41,7 @@ local:organizationForPositionConfig a :ObjectPropertyDisplayConfig ;
     :displayName "people" ;
     :listViewConfigFile "listViewConfig-organizationForPosition.xml"^^xsd:string ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
-    vitro:displayRankAnnot 15;
+    vitro:displayRankAnnot 10;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator"^^xsd:string .
@@ -472,14 +472,14 @@ local:mailingAddressConfig a :ObjectPropertyDisplayConfig ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.SubjectHasMailingAddressGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaddress> .
 
-local:mailingAddressContext a :ConfigContext ;
-    :hasConfiguration local:mailingAddressConfig ;
+local:mailingAddressOrgContext a :ConfigContext ;
+    :hasConfiguration local:mailingAddressOrgConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
     :qualifiedByDomain      <http://xmlns.com/foaf/0.1/Organization> ;
     :qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
     :qualifiedBy      <http://www.w3.org/2006/vcard/ns#Address> .
 
-local:mailingAddressConfig a :ObjectPropertyDisplayConfig ;
+local:mailingAddressOrgConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-mailingAddress.xml"^^xsd:string ;
     :displayName "mailing address" ;
     vitro:displayRankAnnot 80;
@@ -682,6 +682,34 @@ local:preferredTitleConfig a :ObjectPropertyDisplayConfig ;
 
 ### properties using default editing form ##
 
+local:hasSubOrganizationContext a :ConfigContext ;
+    :hasConfiguration local:hasSubOrganizationConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
+    :qualifiedByDomain      <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedBy      <http://xmlns.com/foaf/0.1/Organization> .
+
+local:hasSubOrganizationConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ;
+    :displayName "has sub-organization" ;
+    vitro:displayRankAnnot 15;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
+
+local:subOrganizationWithinContext a :ConfigContext ;
+    :hasConfiguration local:subOrganizationWithinConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
+    :qualifiedByDomain      <http://xmlns.com/foaf/0.1/Organization> ;
+    :qualifiedBy      <http://xmlns.com/foaf/0.1/Organization> .
+
+local:subOrganizationWithinConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ;
+    :displayName "organization within" ;
+    vitro:displayRankAnnot 20;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> .
+
 local:eventWithinContext a :ConfigContext ;
     :hasConfiguration local:eventWithinConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
index 61e44257..d7170973 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
@@ -202,6 +202,8 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
     	String editString = getPrefixesString();
     	editString += "?role <" + getRoleToGrantPredicate(vreq) + "> ?grant .";
     	editString += "?grant a core:Grant . ";
+    	editString += "?person core:relatedBy ?grant . "; 
+    	editString += "?grant core:relates ?person . "; 
     	editString += "?grant <" + getGrantToRolePredicate(vreq) + "> ?role .";
     	editString += "?grant <" + RDFS.label.getURI() + "> ?grantLabel .";
     	return editString;
@@ -209,6 +211,8 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
 	
 	public String getN3ForExistingGrant(VitroRequest vreq) {
     	String editString = getPrefixesString();
+    	editString += "?person core:relatedBy ?existingGrant . "; 
+    	editString += "?existingGrant core:relates ?person . "; 
     	editString += "?role <" + getRoleToGrantPredicate(vreq) + "> ?existingGrant . "; 
     	editString += "?existingGrant <" + getGrantToRolePredicate(vreq) + "> ?role .";
     	return editString;