Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp
===================================================================
diff -u -r714c2ac0cb292aa17fa8457442df8c4d6d2a13a9 -r6e83251edf975179ca6039506431ab8d0f850e4f
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(.../burningQuestions5.jsp)	(revision 714c2ac0cb292aa17fa8457442df8c4d6d2a13a9)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(.../burningQuestions5.jsp)	(revision 6e83251edf975179ca6039506431ab8d0f850e4f)
@@ -16,37 +16,6 @@
 </style>
 <script>
 	$(document).ready(function(){
-		//handler for expand/collapse all button
-		$("#toggle-burning-questions-button").click(function() {
-			var isExpanded = eval($(this).data("expanded"));
-				
-			//fire the actual buttons so burning questions can be closed/expanded
-			if (isExpanded) {
-				$("#burning-questions-accordion .accordion-button:not('.collapsed')").each(function() {
-					this.click();
-				});
-								
-			} else {
-				$("#burning-questions-accordion .accordion-button").each(function() {
-					this.click();
-				});					
-			}
-
-			//change button label
-			var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
-			$(".hidden-xs", $(this)).text(newButtonLabel);
-
-			//change button icon
-			if (isExpanded) {
-				$(".fa", $(this)).removeClass("fa-minus-circle").addClass("fa-plus-circle");
-			} else {
-				$(".fa", $(this)).removeClass("fa-plus-circle").addClass("fa-minus-circle");
-			}
-
-			//change button's data-expanded attribute
-			$(this).data("expanded", !isExpanded);
-		});
-
 		openEventSource('<lams:WebAppURL />tblmonitoring/burningQuestionsFlux.do?toolContentId=' + traToolContentId, function (event) {
 			$("#burningQuestionsTable").load('<lams:WebAppURL />tblmonitoring/burningQuestionsTable.do?toolContentID=' + traToolContentId);
 		});
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp
===================================================================
diff -u -r048fa3b44bb7c131b7db3c4fe031230d20435678 -r6e83251edf975179ca6039506431ab8d0f850e4f
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp	(.../burningQuestionsTable.jsp)	(revision 048fa3b44bb7c131b7db3c4fe031230d20435678)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp	(.../burningQuestionsTable.jsp)	(revision 6e83251edf975179ca6039506431ab8d0f850e4f)
@@ -1,9 +1,45 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="burningQuestionsAvailable" value="${not empty burningQuestionItemDtos}" />
-	
+<c:set var="burningQuestionsAvailable" value="false" />
+<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}">
+	<c:if test="${not empty burningQuestionItemDto.burningQuestionDtos}">
+		<c:set var="burningQuestionsAvailable" value="true" />
+	</c:if>
+</c:forEach>
+		
 <script>
 	$(document).ready(function(){
+		//handler for expand/collapse all button
+		$("#toggle-burning-questions-button").click(function() {
+			var isExpanded = eval($(this).data("expanded"));
+				
+			//fire the actual buttons so burning questions can be closed/expanded
+			if (isExpanded) {
+				$("#burning-questions-accordion .accordion-button:not('.collapsed')").each(function() {
+					this.click();
+				});
+								
+			} else {
+				$("#burning-questions-accordion .accordion-button").each(function() {
+					this.click();
+				});					
+			}
+
+			//change button label
+			var newButtonLabel = isExpanded ? "<fmt:message key='label.expand.all' />" : "<fmt:message key='label.collapse.all' />";
+			$(".hidden-xs", $(this)).text(newButtonLabel);
+
+			//change button icon
+			if (isExpanded) {
+				$(".fa", $(this)).removeClass("fa-minus-circle").addClass("fa-plus-circle");
+			} else {
+				$(".fa", $(this)).removeClass("fa-plus-circle").addClass("fa-minus-circle");
+			}
+
+			//change button's data-expanded attribute
+			$(this).data("expanded", !isExpanded);
+		});
+
 		$('.options-show-link').click(function(e){
 			// so browser does not go to the top of page
 			e.preventDefault();