Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -rbf49caa03b4d5d074f8c7dcfb3b761e66c57d58d
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision bf49caa03b4d5d074f8c7dcfb3b761e66c57d58d)
@@ -248,17 +248,19 @@
 		// remove hidden items
 		if (!image.isHide()) {
 		    images.add(image);
-		}
-		
-		//escape characters
-		String titleEscaped = StringEscapeUtils.escapeJavaScript(image.getTitle());
-		image.setTitleEscaped(titleEscaped);
-		String descriptionEscaped = StringEscapeUtils.escapeJavaScript(image.getDescription());
-		image.setDescriptionEscaped(descriptionEscaped);	
+		}	
 	    }
 	} else {
 	    images.addAll(imageGallery.getImageGalleryItems());
 	}
+	
+	// escape characters
+	for (ImageGalleryItem image : images) {
+	    String titleEscaped = StringEscapeUtils.escapeJavaScript(image.getTitle());
+	    image.setTitleEscaped(titleEscaped);
+	    String descriptionEscaped = StringEscapeUtils.escapeJavaScript(image.getDescription());
+	    image.setDescriptionEscaped(descriptionEscaped);
+	}
 
 	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_LIST, images);
 	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY, imageGallery);
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -rbf49caa03b4d5d074f8c7dcfb3b761e66c57d58d
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bf49caa03b4d5d074f8c7dcfb3b761e66c57d58d)
@@ -111,7 +111,7 @@
 				.fotorama({
 					//TODO history   : true,
 					width: ${mediumImageDimensions + 60},
-					height: ${mediumImageDimensions + 60}*9/16,
+					height: Math.round(${mediumImageDimensions + 60}*9/16),
 					maxwidth: '100%',
 					//ratio: 16/9,
 					allowfullscreen: true,