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>
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -r3813117828096a5d4063e220506bbc6357be2683 -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
@@ -431,7 +431,6 @@
 	location.reload(true);
 }
 
-
 // Serialises the marker array into an xml string for processing on the back end
 function serialiseMarkers()
 {
@@ -455,7 +454,7 @@
 			' longitude="'+ markers[i].getPoint().lng()+ '"'+
 			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
 			' markerUID="'+ markers[i].uid + '"' +
-			' title="'+ markers[i].title + '"' +
+			' title="'+ escape(markers[i].title) + '"' +
 			' state="'+ markers[i].state + '"' +
 			' />';
 			xmlString += markerString;
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r35e9274141376c1057c29b9ec0f26317c09ebce8 -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 35e9274141376c1057c29b9ec0f26317c09ebce8)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
@@ -86,7 +86,7 @@
 function addAuthorMarkers()
 {
 	<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
-	addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, currUser, currUserId);
+	addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), unescape('${marker.infoWindowMessage}'), unescape('${marker.title}'), '${marker.uid}', true, true, currUser, currUserId);
 	</c:forEach>		
 }
 
Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r46ba23ef919b23dbf3449d21555e549032706205 -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446
--- lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 46ba23ef919b23dbf3449d21555e549032706205)
+++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
@@ -225,10 +225,10 @@
 				<c:forEach var="marker" items="${session.markerDTOs}">
 					<c:choose>
 					<c:when test="${marker.isAuthored == true}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<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, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 					</c:when>
 					<c:otherwise>
-						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:otherwise>
 				</c:choose>
 				</c:forEach>
@@ -254,12 +254,12 @@
 			<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">							
 				<c:choose>
 					<c:when test="${marker.isAuthored == true}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<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, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 					</c:when>
 					<c:otherwise>
 						<c:choose>
 							<c:when test="${gmapDTO.allowShowAllMarkers == true || marker.createdBy.loginName == gmapUserDTO.loginName}">
-								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>
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra0b4b138796403af9ee557f34ddebfbb1e20ca75 -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a0b4b138796403af9ee557f34ddebfbb1e20ca75)
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
@@ -312,10 +312,10 @@
 		<c:forEach var="marker" items="${session.markerDTOs}">
 			<c:choose>
 			<c:when test="${marker.isAuthored == true}">
-				addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<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, true, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 			</c:when>
 			<c:otherwise>
-				addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, '${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, true, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');
 			</c:otherwise>
 		</c:choose>
 		</c:forEach>
@@ -333,10 +333,13 @@
 	function makeReflectionDivVisible(id)
 	{
 		var i;
+		if (document.getElementById(id) != null)
+		{
 		<c:forEach var="session" items="${dto.sessionDTOs}">
 			document.getElementById("reflectionDiv${session.sessionID}").style.display = "none";
 		</c:forEach>
 		document.getElementById(id).style.display = "block";
+		}
 	}	
 	
 //-->