diff --git a/productMods/js/individual/individualUtils.js b/productMods/js/individual/individualUtils.js
index 333613cf..df3a9ac5 100644
--- a/productMods/js/individual/individualUtils.js
+++ b/productMods/js/individual/individualUtils.js
@@ -98,15 +98,5 @@ $(document).ready(function(){
         return false;
     });
     
-    // if there are no selected pub, hide the manage link; same for grants
-    if ( $('ul#authorInAuthorshipList').children('li').length < 1 ) {
-        $('a#managePropLink').hide();
-    }
-    if ( $('ul#hasResearcherRoleList').children('li').length < 1 && 
-                $('ul#hasPrincipalInvestigatorRoleList').children('li').length < 1 &&
-                $('ul#hasCo-PrincipalInvestigatorRoleList').children('li').length < 1 && 
-                $('ul#hasInvestigatorRoleList').children('li').length < 1 ) {
-        $('a#manageGrantLink').hide();
-    }
 
 });
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 291458dd..79655cbb 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
@@ -101,15 +101,17 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
             ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             while (results.hasNext()) {
                 QuerySolution soln = results.nextSolution();
-                String subclassUri = soln.get("subclass").toString();
-                VClass vClass = (VClass) vcDao.getVClassByURI(subclassUri);
-                String subclass = ((vClass.getName() == null) ? subclassUri : vClass.getName());
-                if(!subclassToGrants.containsKey(subclass)) {
-                    subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information
-                }
-                String label = soln.get("label").toString();
-                List<Map<String,String>> grantsList = subclassToGrants.get(subclass);
-                    grantsList.add(QueryUtils.querySolutionToStringValueMap(soln));        
+                RDFNode subclassUri= soln.get("subclass");
+                if ( subclassUri != null ) {
+                    String subclassUriStr = soln.get("subclass").toString();
+                    VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr);
+                    String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
+                    if(!subclassToGrants.containsKey(subclass)) {
+                        subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information
+                    }
+                    List<Map<String,String>> grantsList = subclassToGrants.get(subclass);
+                    grantsList.add(QueryUtils.querySolutionToStringValueMap(soln)); 
+                }       
             }
         } catch (Exception e) {
             log.error(e, e);
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 780c0ac6..d00703e6 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
@@ -98,15 +98,17 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
             ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
             while (results.hasNext()) {
                 QuerySolution soln = results.nextSolution();
-                String subclassUri = soln.get("subclass").toString();
-                VClass vClass = (VClass) vcDao.getVClassByURI(subclassUri);
-                String subclass = ((vClass.getName() == null) ? subclassUri : vClass.getName());
-                if(!subclassToPublications.containsKey(subclass)) {
-                    subclassToPublications.put(subclass, new ArrayList<Map<String,String>>()); //list of publication information
+                RDFNode subclassUri= soln.get("subclass");
+                if ( subclassUri != null ) {
+                    String subclassUriStr = soln.get("subclass").toString();
+                    VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr);
+                    String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
+                    if(!subclassToPublications.containsKey(subclass)) {
+                        subclassToPublications.put(subclass, new ArrayList<Map<String,String>>()); //list of publication information
+                    }
+                    List<Map<String,String>> publicationsList = subclassToPublications.get(subclass);
+                    publicationsList.add(QueryUtils.querySolutionToStringValueMap(soln));
                 }
- 
-                List<Map<String,String>> publicationsList = subclassToPublications.get(subclass);
-                publicationsList.add(QueryUtils.querySolutionToStringValueMap(soln));        
             }
         } catch (Exception e) {
             log.error(e, e);