diff --git a/portal-web/docroot/html/portlet/journal/asset/abstract.jsp b/portal-web/docroot/html/portlet/journal/asset/abstract.jsp
index 18393c146688cd74d46169e824ba51f8d1797eb3..ce1b7fd646e87ba1477c8b18ae9a3ac7c0a2a543 100644
--- a/portal-web/docroot/html/portlet/journal/asset/abstract.jsp
+++ b/portal-web/docroot/html/portlet/journal/asset/abstract.jsp
@@ -30,13 +30,13 @@ boolean workflowAssetPreview = GetterUtil.getBoolean((Boolean)request.getAttribu
 
 JournalArticleDisplay articleDisplay = null;
 
-if (!workflowAssetPreview && article.isApproved()) {
-	String xmlRequest = PortletRequestUtil.toXML(renderRequest, renderResponse);
+String xmlRequest = PortletRequestUtil.toXML(renderRequest, renderResponse);
 
-	articleDisplay = JournalContentUtil.getDisplay(articleResource.getGroupId(), articleResource.getArticleId(), null, null, languageId, themeDisplay, 1, xmlRequest);
+if (!workflowAssetPreview && article.isApproved()) {
+	articleDisplay = JournalContentUtil.getDisplay(articleResource.getGroupId(), articleResource.getArticleId(), article.getVersion(), null, null, languageId, themeDisplay, 1, xmlRequest);
 }
 else {
-	articleDisplay = JournalArticleLocalServiceUtil.getArticleDisplay(article, null, null, languageId, 1, null, themeDisplay);
+	articleDisplay = JournalArticleLocalServiceUtil.getArticleDisplay(article, null, null, languageId, 1, xmlRequest, themeDisplay);
 }
 %>
 
@@ -57,7 +57,7 @@ else {
 		<c:choose>
 			<c:when test="<%= Validator.isNotNull(viewURL) %>">
 				<a href="<%= viewURL %>">
-					<img alt="<%= articleDisplay.getTitle() %>" class="asset-small-image" src="<%= HtmlUtil.escape(src) %>" width="150" />
+					<img alt="<%= HtmlUtil.escapeAttribute(articleDisplay.getTitle()) %>" class="asset-small-image" src="<%= HtmlUtil.escapeAttribute(src) %>" width="150" />
 				</a>
 			</c:when>
 			<c:otherwise>
