diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
index bc64e9ba..9cdced0d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
@@ -28,9 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ManageGrantsForIndividualController.class.getName());
-    private VClassDao vcDao = null;
     private static final String TEMPLATE_NAME = "manageGrantsForIndividual.ftl";
-    private List<String> allSubclasses;
     
     @Override
 	protected Actions requiredActions(VitroRequest vreq) {
@@ -43,14 +41,13 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
         Map<String, Object> body = new HashMap<String, Object>();
 
         String subjectUri = vreq.getParameter("subjectUri");
-        
         body.put("subjectUri", subjectUri);
 
-        vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
-
         HashMap<String, List<Map<String,String>>>  grants = getGrants(subjectUri, vreq);
         log.debug("grants = " + grants);
         body.put("grants", grants);
+
+        List<String> allSubclasses = getAllSubclasses(grants);
         body.put("allSubclasses", allSubclasses);
         
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
@@ -81,8 +78,8 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
         + "    OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n" 
         + "} ORDER BY ?subclass ?label2";
     
-       
     HashMap<String, List<Map<String,String>>>  getGrants(String subjectUri, VitroRequest vreq) {
+        VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao(); 
           
         String queryStr = QueryUtils.subUriForQueryVar(GRANT_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
@@ -107,10 +104,14 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
             log.error(e, e);
         }    
        
-        allSubclasses = new ArrayList<String>(subclassToGrants.keySet());
-        Collections.sort(allSubclasses);
         return subclassToGrants;
     }
+
+    private List<String> getAllSubclasses(HashMap<String, List<Map<String, String>>> grants) {
+        List<String> allSubclasses = new ArrayList<String>(grants.keySet());
+        Collections.sort(allSubclasses);
+        return allSubclasses;
+    }
 }
 
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
index 99da6f24..eb610f1a 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
@@ -28,9 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 public class ManagePublicationsForIndividualController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ManagePublicationsForIndividualController.class.getName());
-    private VClassDao vcDao = null;
     private static final String TEMPLATE_NAME = "managePublicationsForIndividual.ftl";
-    private List<String> allSubclasses;
     
     @Override
 	protected Actions requiredActions(VitroRequest vreq) {
@@ -43,14 +41,13 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
         Map<String, Object> body = new HashMap<String, Object>();
 
         String subjectUri = vreq.getParameter("subjectUri");
-        
         body.put("subjectUri", subjectUri);
 
-       	vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
-
         HashMap<String, List<Map<String,String>>>  publications = getPublications(subjectUri, vreq);
         log.debug("publications = " + publications);
         body.put("publications", publications);
+
+        List<String> allSubclasses = getAllSubclasses(publications);
         body.put("allSubclasses", allSubclasses);
         
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
@@ -63,7 +60,6 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
   
-    
     private static String PUBLICATION_QUERY = ""
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
@@ -79,9 +75,10 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
         + "    OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n"
         + "} ORDER BY ?subclass ?title";
     
-       
     HashMap<String, List<Map<String,String>>>  getPublications(String subjectUri, VitroRequest vreq) {
-          
+
+        VClassDao vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
+
         String queryStr = QueryUtils.subUriForQueryVar(PUBLICATION_QUERY, "subject", subjectUri);
         String subclass = "";
         log.debug("queryStr = " + queryStr);
@@ -109,10 +106,12 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
             log.error(e, e);
         }    
        
-        allSubclasses = new ArrayList<String>(subclassToPublications.keySet());
-        Collections.sort(allSubclasses);
         return subclassToPublications;
     }
-}
-
 
+    private List<String> getAllSubclasses(HashMap<String, List<Map<String, String>>> publications) {
+        List<String> allSubclasses = new ArrayList<String>(publications.keySet());
+        Collections.sort(allSubclasses);
+        return allSubclasses;
+    }
+}
\ No newline at end of file