Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
diff -u -re22cd1cb0571749c02a554982f846a72d8beec7f -r8a1b8b9cba5668f9c9b47a716093214aeec87f30
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision e22cd1cb0571749c02a554982f846a72d8beec7f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision 8a1b8b9cba5668f9c9b47a716093214aeec87f30)
@@ -112,15 +112,15 @@
 
     private static final String FIND_BY_UID = "FROM " + AssessmentResult.class.getName() + " AS r WHERE r.uid = ?";
 
-    private static final String ANSWERED_QUESTIONS_BY_USER = "SELECT user_id, portrait_uuid, user_name, SUM(IF("
+    private static final String ANSWERED_QUESTIONS_BY_USER = "SELECT user_id, portrait_uuid, user_name, group_name, SUM(IF("
 	    + "			(type = 1 AND answer_boolean = 1) OR"
 	    + "			(type = 2 AND answer_int <> -1) OR"
 	    + "			((type BETWEEN 3 AND 6) AND (answer IS NOT NULL AND TRIM(answer) <> '')) OR"
 	    + "			(type = 7 AND mark > 0) OR          "
 	    + "			(type = 8 AND answer_int > 0)"
 	    + "			,1, 0)) AS answered_question_count FROM"
 	    + "		(SELECT u.user_id, BIN_TO_UUID(u.portrait_uuid) AS portrait_uuid, CONCAT(u.first_name, ' ', u.last_name) AS user_name,"
-	    + "		 	qbq.type, qr.mark, qbta.answer, oa.answer_boolean, oa.answer_int"
+	    + "		 	IF(a.use_select_leader_tool_ouput, s.session_name, NULL) AS group_name, qbq.type, qr.mark, qbta.answer, oa.answer_boolean, oa.answer_int"
 	    + "         FROM      tl_laasse10_assessment        AS a"
 	    + "		JOIN      tl_laasse10_assessment_result AS ar   ON a.uid =  ar.assessment_uid"
 	    + "         JOIN      tl_laasse10_user              AS au   ON ar.user_uid = au.uid"
@@ -381,11 +381,11 @@
 	List<Object[]> results = getSession().createNativeQuery(ANSWERED_QUESTIONS_BY_USER)
 		.setParameter("toolContentId", toolContentId).getResultList();
 	return results.stream()
-		.collect(
-			Collectors.groupingBy(r -> ((Number) r[3]).intValue(),
-				Collectors.mapping(r -> new String[] { r[0].toString(),
-					r[1] == null ? null : r[1].toString(), r[2] == null ? "" : r[2].toString() },
-					Collectors.toList())));
+		.collect(Collectors.groupingBy(r -> ((Number) r[4]).intValue(),
+			Collectors.mapping(
+				r -> new String[] { r[0].toString(), r[1] == null ? null : r[1].toString(),
+					r[2] == null ? "" : r[2].toString(), r[3] == null ? null : r[3].toString() },
+				Collectors.toList())));
     }
 
     private List<AssessmentUserDTO> convertResultsToAssessmentUserDTOList(List<Object[]> list) {
Index: lams_tool_assessment/web/includes/javascript/chart.js
===================================================================
diff -u -rff9b1c659da59060b4690a29bfdd493e8741b224 -r8a1b8b9cba5668f9c9b47a716093214aeec87f30
--- lams_tool_assessment/web/includes/javascript/chart.js	(.../chart.js)	(revision ff9b1c659da59060b4690a29bfdd493e8741b224)
+++ lams_tool_assessment/web/includes/javascript/chart.js	(.../chart.js)	(revision 8a1b8b9cba5668f9c9b47a716093214aeec87f30)
@@ -212,7 +212,8 @@
 									userDiv = $('<div />').append(portraitDiv).appendTo(tooltipEl).css({
 										'padding-bottom' : '5px'
 									});
-								$('<span />').text(this[2]).appendTo(userDiv).css({
+
+								$('<span />').text(this[3] ? this[3] + ' (' + this[2] + ')' : this[2]).appendTo(userDiv).css({
 									'padding-left' : '10px'
 								});