diff --git a/productMods/WEB-INF/ontologies/app/menu.n3 b/productMods/WEB-INF/ontologies/app/menu.n3
index c9d9c0d7..7ce75a01 100644
--- a/productMods/WEB-INF/ontologies/app/menu.n3
+++ b/productMods/WEB-INF/ontologies/app/menu.n3
@@ -96,27 +96,27 @@ display:Research
     
 #The data getter objects used above
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#peopleDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
       <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
               <http://vivoweb.org/ontology#vitroClassGrouppeople> .
 
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#researchDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
       <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
               <http://vivoweb.org/ontology#vitroClassGrouppublications> .
 
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#organizationsDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
       <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
               <http://vivoweb.org/ontology#vitroClassGrouporganizations> .
                             
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#eventsDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
       <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
               <http://vivoweb.org/ontology#vitroClassGroupevents> .
               
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#homeDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.BrowseDataGetter> .
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> .
       
       
 ## display model pages ###
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
index d2a401fe..5d6c8bf6 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
@@ -42,7 +42,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
 import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessIndividualsForClasses;
-import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.InternalClassesDataGetter;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter;
 
 /*
  * Handle processing of data retrieved from IndividualsForClasses data getter to return to form template
@@ -72,7 +73,7 @@ public class ProcessInternalClasses extends ProcessIndividualsForClasses {
 		return(internalClassSelected(vreq) || !allClassesSelected(vreq));
 	}
 	public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
-		String dataGetterTypeUri = new InternalClassesDataGetter().getType();
+		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName());
 		String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
 		Model dgModel = ModelFactory.createDefaultModel();
 		dgModel.add(dgModel.createStatement(dataGetterResource, 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
index c809c1ea..f5d5a11f 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
@@ -43,7 +43,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
 import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessClassGroup;
 import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessDataGetter;
 import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.SelectDataGetterUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.*;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.*;
 
 
 /*
diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index 3fc7332a..a768e190 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/themes/wilma/templates/identity.ftl
@@ -11,7 +11,7 @@
         <ul id="header-nav" role="list">
             <li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
             <#if user.loggedIn>
-                <#if (page??) && (page.URLToEditPage??) >
+                <#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
                    <li role="listitem"><a href="${page.URLToEditPage}" title="edit page">Edit Page</a></li>
                 </#if>
                 <#if user.hasSiteAdminAccess>