Index: samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueries.java
===================================================================
--- samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueries.java	(revision 306033)
+++ samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueries.java	(working copy)
@@ -769,6 +769,7 @@
 				sb2.append("from ItemData i, SectionData s,  AssessmentData a, AuthorizationData z ");
 				sb2.append("where a = s.assessment and s = i.section and a.assessmentBaseId = z.qualifierId ");
 				sb2.append("and z.functionId=? and z.agentIdString=? ");
+				sb2.append("group by a.assessmentBaseId ");
 				Query q2 = session.createQuery(sb2.toString());
 				q2.setString(0, "EDIT_ASSESSMENT");
 				q2.setString(1, siteAgentId);
@@ -775,9 +776,9 @@
 				return q2.list();
 			};
 		};
-		List size = getHibernateTemplate().executeFind(hcb2);
-		Iterator iter = size.iterator();
-		if (iter.hasNext()) {
+		List questionSizeList = getHibernateTemplate().executeFind(hcb2);
+		Iterator iter = questionSizeList.iterator();
+		while (iter.hasNext()) {
 			Object o[] = (Object[]) iter.next();
 			questionSizeMap.put(o[0], o[1]);
 		}
@@ -903,31 +904,6 @@
 			return 0;
 		}
 	}
-	
-	public HashMap getQuestionSizeMap() {
-		HashMap questionSizeMap = new HashMap();
-		HibernateCallback hcb = new HibernateCallback() {
-			public Object doInHibernate(Session session)
-					throws HibernateException, SQLException {
-				StringBuilder sb = new StringBuilder("select a.assessmentBaseId, count(i) ");
-				sb.append("from ItemData i, SectionData s,  AssessmentData a, AuthorizationData z ");
-				sb.append("where a = s.assessment and s = i.section and a.assessmentBaseId = z.qualifierId ");
-				sb.append("and z.functionId=? and z.agentIdString=? ");
-				Query q = session.createQuery(sb.toString());
-				q.setString(1, "EDIT_ASSESSMENT");
-				q.setString(2, AgentFacade.getCurrentSiteId());
-				return q.list();
-			};
-		};
-		List size = getHibernateTemplate().executeFind(hcb);
-		
-		Iterator iter = size.iterator();
-		if (iter.hasNext()) {
-			Object o[] = (Object[]) iter.next();
-			questionSizeMap.put(o[0], o[1]);
-		}
-		return questionSizeMap;
-	}
 
 	public void deleteAllSecuredIP(AssessmentIfc assessment) {
 		int retryCount = PersistenceService.getInstance().getPersistenceHelper().getRetryCount()
Index: samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueriesAPI.java
===================================================================
--- samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueriesAPI.java	(revision 306033)
+++ samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueriesAPI.java	(working copy)
@@ -146,8 +146,6 @@
 
 	public int getQuestionSize(final Long assessmentId);
 
-	public HashMap getQuestionSizeMap();
-	
 	public void deleteAllSecuredIP(AssessmentIfc assessment);
 
 	public void saveOrUpdate(AssessmentFacade assessment);
Index: samigo-services/src/java/org/sakaiproject/tool/assessment/services/assessment/AssessmentService.java
===================================================================
--- samigo-services/src/java/org/sakaiproject/tool/assessment/services/assessment/AssessmentService.java	(revision 306033)
+++ samigo-services/src/java/org/sakaiproject/tool/assessment/services/assessment/AssessmentService.java	(working copy)
@@ -27,7 +27,6 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -276,11 +275,6 @@
 				.getQuestionSize(new Long(assessmentId));
 	}
 	
-	public HashMap getQuestionSizeMap() {
-		return PersistenceService.getInstance().getAssessmentFacadeQueries()
-				.getQuestionSizeMap();
-	}
-	
 	public void update(AssessmentFacade assessment) {
 		PersistenceService.getInstance().getAssessmentFacadeQueries()
 				.saveOrUpdate(assessment);