diff --git a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
index 41e55e18..7c51ec06 100644
--- a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
@@ -127,15 +127,10 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customFormWithAutocomplete.css" />')}
 
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}
 
-<#--
-Scripts based on jsp also include browserUtils
+
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}
--->
 </#if>
\ No newline at end of file
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 12fa6cc9..d63588c0 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
@@ -861,9 +861,9 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
 		String predicate = EditConfigurationUtils.getPredicateUri(vreq);
 		
 		
-		String query = "PREFIX core:<" + getVivoCoreNamespace() + "> \n" + 
-		"SELECT ?grantUri WHERE { \n" + 
-			"<" + subject + "> <" + predicate + "> ?grantRole .\n" +
+		String query = "PREFIX core:<" + getVivoCoreNamespace() + "> " + 
+		"SELECT ?grantUri WHERE { " + 
+			"<" + subject + "> <" + predicate + "> ?grantRole ." +
 			"?grantRole <" + getRoleToGrantPredicate(vreq) + "> ?grantUri . }";
 		return query;
 	}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
index 6dd82528..a1bb5eef 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
@@ -34,6 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.RdfLiteralHash;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditN3GeneratorVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.SelectListGeneratorVTwo;
@@ -95,6 +96,9 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
     	//set fields
     	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
     	
+    	//Add preproprocessors
+    	
+    	
     //	No need to put in session here b/c put in session within edit request dispatch controller instead
     	//placing in session depends on having edit key which is handled in edit request dispatch controller
     //	editConfiguration.putConfigInSession(editConfiguration, session);
@@ -111,13 +115,23 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
     	//Set edit key
     	setEditKey(editConfiguration, vreq);
         addFormSpecificData(editConfiguration, vreq);
+        
+        
+        addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
+
 
     	return editConfiguration;
     	
 
     }
     
-    private Map<String, String> generateNewResources(VitroRequest vreq) {
+    private void addPreprocessors(EditConfigurationVTwo editConfiguration,
+			WebappDaoFactory webappDaoFactory) {
+		editConfiguration.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());
+		
+	}
+
+	private Map<String, String> generateNewResources(VitroRequest vreq) {
     	HashMap<String, String> newResources = new HashMap<String, String>();
 		//TODO: Get default namespace
 		String defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace();
@@ -275,6 +289,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
     	getLabelField(editConfiguration, vreq, fields);
     	getFirstNameField(editConfiguration, vreq, fields);
     	getLastNameField(editConfiguration, vreq, fields);
+    	editConfiguration.setFields(fields);
     }
     
     private void getLastNameField(EditConfigurationVTwo editConfiguration,