diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index 7b7e5e90..2390270d 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -5,5 +5,8 @@
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+	<jsp:param name="roleActivityType_literalOptions" 
+	           value='["", "Select one"], 
+	                  ["http://vivoweb.org/ontology/core#Project", "Project" ], 
+	                  [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
index 2b1ef8a3..ce14f563 100644
--- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp
+++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
@@ -11,14 +11,14 @@
     value='["", "Select one"],
            [ "http://vivoweb.org/ontology/core#Association", "Association" ],
            [ "http://vivoweb.org/ontology/core#Center", "Center" ],
-           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
+           [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
            [ "http://vivoweb.org/ontology/core#College", "College" ],
            [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],                     
            [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
            [ "http://vivoweb.org/ontology/core#Department", "Department" ],
            [ "http://vivoweb.org/ontology/core#Division", "Division" ], 
            [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
-           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
+           [ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ],
            [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
            [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
            [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
@@ -36,6 +36,6 @@
            [ "http://vivoweb.org/ontology/core#School", "School" ],
            [ "http://vivoweb.org/ontology/core#Service","Service"],
            [ "http://vivoweb.org/ontology/core#Team", "Team" ],
-           [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
+           [ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ],
            [ "http://vivoweb.org/ontology/core#University", "University" ]' />  
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addOutreachRoleToPerson.jsp b/productMods/edit/forms/addOutreachRoleToPerson.jsp
index d8896b4f..0f309540 100644
--- a/productMods/edit/forms/addOutreachRoleToPerson.jsp
+++ b/productMods/edit/forms/addOutreachRoleToPerson.jsp
@@ -10,14 +10,14 @@
     value='["", "Select one"],
            [ "http://vivoweb.org/ontology/core#Association", "Association" ],
            [ "http://vivoweb.org/ontology/core#Center", "Center" ],
-           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
+           [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
            [ "http://vivoweb.org/ontology/core#College", "College" ],
            [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],                     
            [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
            [ "http://vivoweb.org/ontology/core#Department", "Department" ],
            [ "http://vivoweb.org/ontology/core#Division", "Division" ], 
            [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
-           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
+           [ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ],
            [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
            [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
            [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
@@ -35,6 +35,6 @@
            [ "http://vivoweb.org/ontology/core#Team", "Team" ],
            [ "http://vivoweb.org/ontology/core#School", "School" ],
            [ "http://vivoweb.org/ontology/core#Service","Service"],
-           [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
+           [ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ],
            [ "http://vivoweb.org/ontology/core#University", "University" ]' /> 
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index 3b29cc77..6bb02e92 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -8,5 +8,8 @@
 	<jsp:param name="numDateFields" value="1" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
+	<jsp:param name="roleActivityType_literalOptions" 
+	           value='["", "Select one"], 
+	                  ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], 
+	                  [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp
index e075311c..e7158f1e 100644
--- a/productMods/edit/forms/addResearcherRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp
@@ -6,5 +6,8 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
+	<jsp:param name="roleActivityType_literalOptions" 
+	           value='["", "Select one"], 
+	                  ["http://vivoweb.org/ontology/core#Grant", "Grant" ], 
+	                  [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 858850dc..12cb02d8 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -580,7 +580,7 @@ private String getActivityTypeQuery(VitroRequest vreq) {
 	                    JSONArray option = values.getJSONArray(i);
 	                    String uri = option.getString(0);
 	                    if (StringUtils.isNotBlank(uri)) {
-	                        typeUris.add("(?existingTypeActivity = \"" + uri + "\")");
+	                        typeUris.add("(?existingActivityType = <" + uri + ">)");
 	                    }	                    
 	                }
 	                String typeFilters = "FILTER (" + StringUtils.join(typeUris, "||") + ")";
diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
index c483a58f..ccab85c6 100644
--- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
+++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
@@ -10,14 +10,14 @@
     value='["", "Select one"],
            [ "http://vivoweb.org/ontology/core#Association", "Association" ],
            [ "http://vivoweb.org/ontology/core#Center", "Center" ],
-           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
+           [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
            [ "http://vivoweb.org/ontology/core#College", "College" ],
            [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],                     
            [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
            [ "http://vivoweb.org/ontology/core#Department", "Department" ],
            [ "http://vivoweb.org/ontology/core#Division", "Division" ], 
            [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
-           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
+           [ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ],
            [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
            [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
            [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
@@ -35,6 +35,6 @@
            [ "http://vivoweb.org/ontology/core#Team", "Team" ],
            [ "http://vivoweb.org/ontology/core#School", "School" ],
            [ "http://vivoweb.org/ontology/core#Service","Service"],
-           [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
+           [ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ],
            [ "http://vivoweb.org/ontology/core#University", "University" ]' />  
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp
index adc333d1..75c1d7d7 100644
--- a/productMods/edit/forms/addTeacherRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp
@@ -6,5 +6,9 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
+	<jsp:param name="roleActivityType_literalOptions" 
+	           value='["", "Select one"], 
+	                  ["http://purl.org/ontology/bibo/Conference", "Conference" ], 
+	                  [ "http://vivoweb.org/ontology/core#Course","Course"], 
+	                  [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
 </jsp:include>
\ No newline at end of file