Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -rce3ca90e327ffcef1fe8c1ca88f7caefaa4c8cbb -r03a003d5613ffaac6f9b96bef5170e9743642808
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision ce3ca90e327ffcef1fe8c1ca88f7caefaa4c8cbb)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 03a003d5613ffaac6f9b96bef5170e9743642808)
@@ -284,7 +284,7 @@
 	
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			Usage in lessons
+			Usage in active lessons
 		</div>
 		<div class="panel-body">
 			<c:choose>
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u -r0f2b554d8e5dca78a8e936730490d03ecd0357ba -r03a003d5613ffaac6f9b96bef5170e9743642808
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 0f2b554d8e5dca78a8e936730490d03ecd0357ba)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 03a003d5613ffaac6f9b96bef5170e9743642808)
@@ -26,8 +26,9 @@
 
     private static final String FIND_MAX_VERSION = "SELECT MAX(version) FROM QbQuestion AS q WHERE q.questionId = :questionId";
 
-    private static final String FIND_QUESTION_ACTIVITIES = "SELECT a FROM ToolActivity AS a, QbToolQuestion AS q "
-	    + "WHERE a.toolContentId = q.toolContentId AND a.learningDesign.lessons IS NOT EMPTY AND q.qbQuestion.uid = :qbQuestionUid";
+    private static final String FIND_QUESTION_ACTIVITIES = "SELECT a FROM QbToolQuestion AS q, ToolActivity AS a JOIN a.learningDesign.lessons AS l "
+	    + "WHERE a.toolContentId = q.toolContentId AND l IS NOT EMPTY AND l.lessonStateId IN (3,4,5,6) AND q.qbQuestion.uid = :qbQuestionUid "
+	    + "ORDER BY l.organisation.name, l.lessonName";
 
     private static final String FIND_QUESTION_VERSIONS = "SELECT q FROM QbQuestion AS q, QbQuestion AS r "
 	    + "WHERE q.questionId = r.questionId AND q.uid <> r.uid AND r.uid = :qbQuestionUid";