diff --git a/src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java b/src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java
index 1424fe5a6083ac2883403f9dd5ba4547820ebbec..e38ab2014332f5a847b5e7bb7b72718459aec605 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java
@@ -275,7 +275,7 @@ public class ListRenderer {
 		if(xssErrors) {
 			sb.append("<i class='o_icon o_icon-fw o_icon_banned'> </i> ");
 			sb.append(StringHelper.escapeHtml(name));
-			log.error("XSS Scan found something suspicious in: " + child);
+			log.error("XSS Scan found something suspicious in: {}", child);
 		} else {
 			sb.append("<a id='o_sel_doc_").append(pos).append("'");
 		
@@ -361,7 +361,6 @@ public class ListRenderer {
 			if (hasMeta) {
 				// render tooltip only when it contains something
 				sb.append("<script>")
-			      .append("/* <![CDATA[ */")
 				  .append("jQuery(function() {\n")
 				  .append("  jQuery('#o_sel_doc_").append(pos).append("').tooltip({\n")
 				  .append("	   html: true,\n")
@@ -372,7 +371,6 @@ public class ListRenderer {
 				  .append("	   jQuery('#o_sel_doc_").append(pos).append("').tooltip('hide');\n")
 				  .append("  });\n")
 				  .append("});")
-				  .append("/* ]]> */")
 				  .append("</script>");
 			}
 		}
@@ -412,7 +410,7 @@ public class ListRenderer {
 		}
 
 		if(canContainerVersion) {
-			if (canVersion && revisionNr > 1) {
+			if (metadata != null && canVersion && revisionNr > 1) {
 				sb.append("<span class='text-muted small'>")
 				  .append(metadata.getRevisionNr())
 				  .append("</span>");
@@ -453,7 +451,7 @@ public class ListRenderer {
 			if (openIcon != null) {
 				sb.append("<a ");
 				ubu.buildHrefAndOnclick(sb, null, iframePostEnabled, false, false,
-						new NameValuePair(PARAM_CONTENT_EDIT_ID, pos));
+						new NameValuePair(PARAM_CONTENT_EDIT_ID, pos), new NameValuePair("oo-opennewwindow-oo", "true"));
 				sb.append(" title=\"").append(StringHelper.escapeHtml(translator.translate("mf.open")));
 				sb.append("\"><i class=\"o_icon o_icon-fw ").append(openIcon).append("\"></i></a>");
 			}
@@ -500,11 +498,9 @@ public class ListRenderer {
 
 				sb.append("</ul></div>")
 				  .append("<script>")
-			      .append("/* <![CDATA[ */")
 				  .append("jQuery(function() {\n")
 				  .append("  o_popover('o_sel_actions_").append(pos).append("','o_sel_actions_pop_").append(pos).append("','left');\n")
 				  .append("});")
-				  .append("/* ]]> */")
 				  .append("</script>");
 			}
 		}
diff --git a/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryServiceImplTest.java b/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryServiceImplTest.java
index 6f29bdc1b4c2f4e1ad85afae926806d2034cc6d5..6b60fc256192ea68f7183dc5a0433822bd6c21ab 100644
--- a/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryServiceImplTest.java
+++ b/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryServiceImplTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 import org.olat.core.commons.services.doceditor.discovery.Action;
 import org.olat.core.commons.services.doceditor.discovery.App;
 import org.olat.core.commons.services.doceditor.discovery.NetZone;
-import org.olat.core.commons.services.doceditor.discovery.manager.DiscoveryServiceImpl;
 import org.olat.core.commons.services.doceditor.discovery.model.ActionImpl;
 import org.olat.core.commons.services.doceditor.discovery.model.AppImpl;
 import org.olat.core.commons.services.doceditor.discovery.model.DiscoveryImpl;
diff --git a/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryXStreamTest.java b/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryXStreamTest.java
index 0ad0e68d31ce1156bd5ae1bcb41db2ae0100414b..a17b116f9cc07b229b4570abf31550c266722bc4 100644
--- a/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryXStreamTest.java
+++ b/src/test/java/org/olat/core/commons/services/doceditor/discovery/manager/DiscoveryXStreamTest.java
@@ -31,7 +31,6 @@ import org.olat.core.commons.services.doceditor.discovery.App;
 import org.olat.core.commons.services.doceditor.discovery.Discovery;
 import org.olat.core.commons.services.doceditor.discovery.NetZone;
 import org.olat.core.commons.services.doceditor.discovery.ProofKey;
-import org.olat.core.commons.services.doceditor.discovery.manager.DiscoveryXStream;
 
 /**
  *