diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
index e7529b798..807b38798 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
@@ -787,7 +787,11 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                     VClass vcw = (VClass) getVClassByURI(cls.getURI());
                                     if (vcw != null) {
                                         boolean classIsInstantiated = false;
-                                        if (includeUninstantiatedClasses == false) {
+                                        if (getIndividualCount) {
+                                        	int count = getOntModel().listStatements(null,RDF.type,cls).toList().size();
+                                        	vcw.setEntityCount(count);
+                                        	classIsInstantiated = (count > 0);
+                                        } else if (includeUninstantiatedClasses == false) {
 	                                        // Note: to support SDB models, may want to do this with 
 	                                        // SPARQL and LIMIT 1 if SDB can take advantage of it
 	                                        ClosableIterator countIt = getOntModel().listStatements(null,RDF.type,cls);
@@ -799,7 +803,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
 	                                            countIt.close();
 	                                        }
                                         }
-                                        //vcw.setEntityCount(count);
+                                        
                                         if (includeUninstantiatedClasses || classIsInstantiated) {
                                             group.add(vcw);
                                         }