Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r40f2ba218df565d53c58eb97ca60c409887faa63 -r306386beac11809274a80f186288a95ce2f9fae1
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 40f2ba218df565d53c58eb97ca60c409887faa63)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 306386beac11809274a80f186288a95ce2f9fae1)
@@ -166,7 +166,25 @@
 						},
 				   		{name:'count', index:'count', width:50, align:"right", title: false}
 				   	],
-                    caption: <c:choose><c:when test="${scratchieItemUid == 0}">"${scratchieItem.qbQuestion.name}"</c:when><c:otherwise>"<a href='#${scratchieItem.qbQuestion.name}' class='bq-title'>${scratchieItem.qbQuestion.name}</a>"</c:otherwise></c:choose> + " <span class='small'>[${fn:length(burningQuestionItemDto.burningQuestionDtos)}]</span>",
+                    caption: <c:choose>
+								<%-- General burning question --%>
+								<c:when test="${scratchieItemUid == 0}">"<c:out value='${scratchieItem.qbQuestion.name}' />"
+								</c:when>
+								<c:otherwise>
+									<%-- Regular burning question --%>
+									<c:choose>
+										<%-- If we hide titles, we just display a link for "Question 1)" --%>
+										<c:when test="${sessionMap.hideTitles}">
+										 	"<a href='#questionTitle${i.count}' class='bq-title'><fmt:message key='label.question'/>&nbsp;${i.count})</a>"
+										</c:when>
+										<%-- If we show titles, we display question number and then a link with question title --%>
+										<c:otherwise>
+											"${i.count}) <a href='#questionTitle${i.count}' class='bq-title'><c:out value='${scratchieItem.qbQuestion.name}' /></a>"
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose> 
+							+ " <span class='small'>[${fn:length(burningQuestionItemDto.burningQuestionDtos)}]</span>",
                     editurl: '<c:url value="/learning/editBurningQuestion.do"/>?sessionId=${toolSessionID}&itemUid=${scratchieItemUid}',
 	  	          	beforeEditRow: function (options, rowid) {
 		  	          	alert("aaa");
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 -r306386beac11809274a80f186288a95ce2f9fae1
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 306386beac11809274a80f186288a95ce2f9fae1)
@@ -2,12 +2,12 @@
 
 <c:forEach var="item" items="${sessionMap.itemList}" varStatus="questionNumber">
 	
-		<div class="lead">
-	        ${questionNumber.count})&nbsp;
-	        <c:if test="${not sessionMap.hideTitles}">
-	        	<a name="${item.qbQuestion.name}" style="text-decoration:none;color:black"><c:out value="${item.qbQuestion.name}" escapeXml="true" /></a>
-	       </c:if>
-		</div>
+	<div class="lead" id="questionTitle${questionNumber.count}">
+        ${questionNumber.count})&nbsp;
+        <c:if test="${not sessionMap.hideTitles}">
+        	<c:out value="${item.qbQuestion.name}" escapeXml="true" />
+       </c:if>
+	</div>
 	
 	<div class="panel-body-sm">
 		<c:out value="${item.qbQuestion.description}" escapeXml="false" />