Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r2e5708a7cd242f72aecf91251e52dde68a72017f -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 2e5708a7cd242f72aecf91251e52dde68a72017f)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
@@ -82,16 +82,16 @@
 		    	<c:forEach var="marker" items="${gmapSessionDTO.markerDTOs}">
 					<c:choose>
 					<c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}">
-					    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ),'${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');	
+					    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), unescape('${marker.infoWindowMessage}'), unescape('${marker.title}'), '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');	
 						userMarkerCount ++;
 					</c:when>
 					<c:otherwise>
 						<c:choose>
 						<c:when  test="${marker.isAuthored}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), unescape('${marker.infoWindowMessage}'), unescape('${marker.title}'), '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0' );
 						</c:when>
 						<c:when  test="${gmapDTO.allowShowAllMarkers}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), unescape('${marker.infoWindowMessage}'), unescape('${marker.title}'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' );
 						</c:when>
 						</c:choose>
 					</c:otherwise>