Index: lams_admin/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_admin/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_admin/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_central/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_gradebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_gradebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_learning/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_learning/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_monitoring/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_monitoring/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_chat/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_chat/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_daco/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_daco/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_doku/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_doku/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_forum/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_forum/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_gmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_gmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_images/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_images/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_imscc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_imscc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_laqa/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_laqa/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_larsrc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_larsrc/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_leader/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_leader/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_mindmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_mindmap/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_nb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_nb/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_pixlr/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_pixlr/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_preview/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_preview/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_sbmt/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_sbmt/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_scratchie/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_scratchie/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_survey/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_survey/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_task/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_task/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_vote/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_vote/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_whiteboard/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_tool_zoom/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_tool_zoom/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -re9ead091842209dfa1ec631bcce5a2cd271e227d -rcaeb1e13c1ca119f520f63cd1f8702eaff739aa0
--- lams_www/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision e9ead091842209dfa1ec631bcce5a2cd271e227d)
+++ lams_www/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision caeb1e13c1ca119f520f63cd1f8702eaff739aa0)
@@ -60,7 +60,7 @@
           	${not empty accordionTitle?accordionTitle:"Comments"}</a>
       		</span>
         </div>
-        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse"
+        <div id="collapseComments-${toolSessionId}-${toolItemId}" class="panel-collapse collapse collapseComments"
         	 role="tabpanel" aria-labelledby="headingComments-${toolSessionId}-${toolItemId}" aria-expanded="false" style="">
 </c:if>
 
@@ -75,7 +75,17 @@
 <script>
 $(document).ready(function(){
 	var url='<lams:LAMSURL/>comments/init.do?externalID=${toolSessionId}&externalSecondaryID=${toolItemId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}&anonymous=${anonymous}';
-	$.ajaxSetup({ cache: true });
-	$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+	
+	<c:choose>
+		<c:when test="${embedInAccordian}">
+			$('#collapseComments-${toolSessionId}-${toolItemId}').on('show.bs.collapse', function(){
+				$('.collapseComments').not('#collapseComments-${toolSessionId}-${toolItemId}').collapse('hide').find('.commentFrame').empty();
+				$('.commentFrame', this).load(url);
+			});
+		</c:when>
+		<c:otherwise>
+			$('#commentFrame-${toolSessionId}-${toolItemId}').load(url);
+		</c:otherwise>
+	</c:choose>
 });
 </script>
\ No newline at end of file