Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
===================================================================
diff -u -r53da87e800b056d498ccd7eaa8d48288ea8f806a -r67eb97d89e2400b6dfba6b978f608c376a25a00d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 53da87e800b056d498ccd7eaa8d48288ea8f806a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 67eb97d89e2400b6dfba6b978f608c376a25a00d)
@@ -140,7 +140,7 @@
 	// Create BurningQuestionsDtos if BurningQuestions is enabled.
 	if (scratchie.isBurningQuestionsEnabled()) {
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
-		    null, false, true);
+		    null, true, true);
 	    MonitoringController.setUpBurningQuestions(burningQuestionItemDtos);
 	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
 	}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -r53da87e800b056d498ccd7eaa8d48288ea8f806a -r67eb97d89e2400b6dfba6b978f608c376a25a00d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision 53da87e800b056d498ccd7eaa8d48288ea8f806a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision 67eb97d89e2400b6dfba6b978f608c376a25a00d)
@@ -178,7 +178,7 @@
 	//find available burningQuestionDtos, if any
 	if (scratchie.isBurningQuestionsEnabled()) {
 	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
-		    null, false, true);
+		    null, true, true);
 
 	    MonitoringController.setUpBurningQuestions(burningQuestionItemDtos);
 
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp
===================================================================
diff -u -rc606e9ef96a924f5389866c6fceb1c7fee959032 -r67eb97d89e2400b6dfba6b978f608c376a25a00d
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision c606e9ef96a924f5389866c6fceb1c7fee959032)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision 67eb97d89e2400b6dfba6b978f608c376a25a00d)
@@ -76,43 +76,29 @@
 
 	<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
 		<c:set var="burningQsCount" value="${fn:length(burningQuestionItemDto.burningQuestionDtos)}"/>
-		<c:set var="item" value="${burningQuestionItemDto.scratchieItem}"/>
-		
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				<h4 class="panel-title panel-collapse">
-					
-					<!-- Don't display number prior to general burning question -->
-					<c:set var="itemTitle">
-						<c:choose>
-							<c:when test="${empty burningQuestionItemDto.scratchieItem.uid}">
-								<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
-							</c:when>
-							<c:otherwise>
-								Q${i.index+1}) 
-								<c:if test="${not hideTitles}">
+		<c:if test="${burningQsCount > 0}">
+			<c:set var="item" value="${burningQuestionItemDto.scratchieItem}"/>
+
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<h4 class="panel-title panel-collapse">
+						<a data-toggle="collapse" data-itemuid="${item.uid}" class="collapsed burning-question-title">
+							<!-- Don't display number prior to general burning question -->
+							<c:choose>
+								<c:when test="${empty burningQuestionItemDto.scratchieItem.uid}">
 									<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
-								</c:if> 
-							</c:otherwise>
-						</c:choose>
-					</c:set>
-				
-					<c:choose>
-						<c:when test="${empty burningQuestionItemDto.scratchieItem.uid and burningQsCount == 0}">
-							${itemTitle} 
-						</c:when>
-						<c:otherwise>
-							<a data-toggle="collapse" data-itemuid="${item.uid}" class="collapsed burning-question-title">
-								${itemTitle}
-							</a>
-							
-							<span class="badge pull-right" style="margin-right: 4px">${burningQsCount}</span>
-						</c:otherwise>
-					</c:choose> 
-				</h4>
-			</div>
-		
-			<c:if test="${not empty burningQuestionItemDto.scratchieItem.uid or burningQsCount > 0}">
+								</c:when>
+								<c:otherwise>
+									Q${i.index+1}) 
+									<c:if test="${not hideTitles}">
+										<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
+									</c:if> 
+								</c:otherwise>
+							</c:choose>
+						</a>
+					</h4>
+				</div>
+			
 				<div id="collapse-${item.uid}" class="panel-collapse collapse">
 				<div class="panel-body">
 				
@@ -163,9 +149,9 @@
 					</div>
 				</div>
 				</div>
-			</c:if>
-			
-		</div>
+				
+			</div>
+		</c:if>
 	</c:forEach>    
   
 </div>