diff --git a/src/main/java/org/olat/core/gui/components/ComponentRenderer.java b/src/main/java/org/olat/core/gui/components/ComponentRenderer.java
index ed4cb117a658d474033869df9a0d3a7a5e704cdf..ef7f12bb8a0919b7210906ce67a7b3effeda5751 100644
--- a/src/main/java/org/olat/core/gui/components/ComponentRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/ComponentRenderer.java
@@ -41,7 +41,8 @@ import org.olat.core.gui.translator.Translator;
 public interface ComponentRenderer {
 
 	/**
-	 * calls must be threadsafe
+	 * Calls must be threadsafe and the caller set dirty to false on the component.
+	 * 
 	 * @param renderer
 	 * @param sb
 	 * @param source
diff --git a/src/main/java/org/olat/core/gui/components/choice/ChoiceRenderer.java b/src/main/java/org/olat/core/gui/components/choice/ChoiceRenderer.java
index 97dbbfff309d92e04b8d439abdc2ca454345d973..5cb3e21c6a28df7dcbac9e110c58b5f0f8795cb3 100644
--- a/src/main/java/org/olat/core/gui/components/choice/ChoiceRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/choice/ChoiceRenderer.java
@@ -43,12 +43,6 @@ import org.olat.core.util.StringHelper;
  */
 public class ChoiceRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
 	@Override
 	public void render(Renderer renderer, StringOutput target, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SelectboxRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SelectboxRenderer.java
index 22a834736aea8a21ff582de82b623a7f0c09274d..9658ade6b0de1134ce5d79f70b094a1424c34e4b 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SelectboxRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SelectboxRenderer.java
@@ -44,9 +44,7 @@ import org.olat.core.util.StringHelper;
  */
 class SelectboxRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer, org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component, org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator, org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SingleSelectionRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SingleSelectionRenderer.java
index aa386ffc3f34355f6ee70f3a94218a2bcc75bfac..39b205cc66833ced8b1eec1bc26f1cfd428bb48b 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SingleSelectionRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SingleSelectionRenderer.java
@@ -39,14 +39,6 @@ import org.olat.core.util.StringHelper;
  */
 class SingleSelectionRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SpacerElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SpacerElementRenderer.java
index e1fd848d3e956815a76ee761e5df83f4528992a9..0d23bd6b7fdd8b48c6dbe146d57fa14e26d354da 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SpacerElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SpacerElementRenderer.java
@@ -36,14 +36,6 @@ import org.olat.core.gui.translator.Translator;
  */
 public class SpacerElementRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source,
 			URLBuilder ubu, Translator translator, RenderResult renderResult,
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/StaticTextElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/StaticTextElementRenderer.java
index e787b9358446fe6eac73fcbd8b47c64d21cbd371..672496bec8c7a7524953975e1ee9b997ce35aee6 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/StaticTextElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/StaticTextElementRenderer.java
@@ -45,9 +45,7 @@ import org.olat.core.util.StringHelper;
  */
 class StaticTextElementRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer, org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component, org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator, org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
 
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/TextAreaElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/TextAreaElementRenderer.java
index c34137d929ecd2c20db624a4f1c0136da725c18d..f5c557f42e120e457a49fafec6a0f31061de6058 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/TextAreaElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/TextAreaElementRenderer.java
@@ -45,14 +45,7 @@ import org.olat.core.util.StringHelper;
  */
 class TextAreaElementRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java
index 2551742adca10ebf126e81f1d24684eef1425e78..6d20fefbb8343222cf922a9963a2420c4c4cdc41 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java
@@ -387,6 +387,7 @@ public abstract class AbstractFlexiTableRenderer extends DefaultComponentRendere
 		if(item != null) {
 			Component cmp = item.getComponent();
 			cmp.getHTMLRendererSingleton().render(renderer, sb, cmp, ubu, translator, renderResult, args);
+			cmp.setDirty(false);
 		}
 	}
 	
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java
index 9df62051ce5e619605b6684145a516340a0dc541..dce0146fdc8c86ce32fe5b92d579fa6f8f7da09d 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java
@@ -229,6 +229,7 @@ class FlexiTableClassicRenderer extends AbstractFlexiTableRenderer implements Co
 
 			container.getHTMLRendererSingleton().render(renderer, target, container, ubu, translator, renderResult, null);
 			container.contextRemove("row");
+			container.setDirty(false);
 			
 			target.append("</td></tr>");
 		}
diff --git a/src/main/java/org/olat/core/gui/components/htmlheader/HtmlHeaderRenderer.java b/src/main/java/org/olat/core/gui/components/htmlheader/HtmlHeaderRenderer.java
index a3962985dc844de9e492734e1c4c070576233a53..0d6928c79b232b0da55a030a6017ae378a52efa0 100644
--- a/src/main/java/org/olat/core/gui/components/htmlheader/HtmlHeaderRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/htmlheader/HtmlHeaderRenderer.java
@@ -43,33 +43,22 @@ import org.olat.core.logging.OLATRuntimeException;
  */
 public class HtmlHeaderRenderer implements ComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
+	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
 		// nothing to render
 		throw new OLATRuntimeException(HtmlHeaderRenderer.class, "render method should never be called for JsCssHeaderRenderer", null);
 	}
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#renderBodyOnLoadJSFunctionCall(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component)
-	 */
+	@Override
 	public void renderBodyOnLoadJSFunctionCall(Renderer renderer, StringOutput sb, Component source, RenderingState rstate) {
 		HtmlHeaderComponent hc = (HtmlHeaderComponent) source;
 		String js = hc.getJsBodyOnLoad();
 		if (js != null) sb.append(js);
 	}
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#renderHeaderIncludes(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator)
-	 */
+	@Override
 	public void renderHeaderIncludes(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderingState rstate) {
 		HtmlHeaderComponent hc = (HtmlHeaderComponent) source;
diff --git a/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponentRenderer.java b/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponentRenderer.java
index bc787249b4f893678ae8e50dc4b16859e3fb04b2..c874846a851ca523047bddbf00c3a3b99f089139 100644
--- a/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponentRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponentRenderer.java
@@ -60,7 +60,7 @@ public class HtmlStaticPageComponentRenderer implements ComponentRenderer {
 		if (htmlContent != null && wrapperCssStyle != null) {
 			htmlContent = "<div style=\"" + wrapperCssStyle + "\">" + htmlContent + "</div>";			
 		}
-		// Indicate to framework that the page probably will load some media files
+		//S Indicate to framework that the page probably will load some media files
 		renderResult.setAsyncMediaResponsible(cpc); // indicate browser fetch of e.g. images includes in the rendered page should be directed to the cpcomponent so this component can deliver the e.g. images
 		if (htmlContent != null) target.append(htmlContent);
 	}
diff --git a/src/main/java/org/olat/core/gui/components/image/ImageRenderer.java b/src/main/java/org/olat/core/gui/components/image/ImageRenderer.java
index fbb622e90eb0ce88fa8649cbd55f093e55021d7a..3a31ee9dbdb2f38bb6a7afecef248d5e3903f9d2 100644
--- a/src/main/java/org/olat/core/gui/components/image/ImageRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/image/ImageRenderer.java
@@ -44,12 +44,6 @@ import org.olat.core.util.StringHelper;
  */
 public class ImageRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/panel/LayeredPanelRenderer.java b/src/main/java/org/olat/core/gui/components/panel/LayeredPanelRenderer.java
index a1a93a84b70f3cd875a58142e77e638c774dd944..2ef0fa83e293be483038faf1c54040c0b55a1353 100644
--- a/src/main/java/org/olat/core/gui/components/panel/LayeredPanelRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/panel/LayeredPanelRenderer.java
@@ -42,14 +42,6 @@ import org.olat.core.gui.translator.Translator;
  */
 public class LayeredPanelRenderer extends PanelRenderer {
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source,
 			URLBuilder ubu, Translator translator, RenderResult renderResult,
@@ -82,13 +74,6 @@ public class LayeredPanelRenderer extends PanelRenderer {
 		}
 	}
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#renderHeaderIncludes(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator)
-	 */
 	@Override
 	public void renderHeaderIncludes(Renderer renderer, StringOutput sb,
 			Component source, URLBuilder ubu, Translator translator,
@@ -104,11 +89,6 @@ public class LayeredPanelRenderer extends PanelRenderer {
 		}
 	}
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#renderBodyOnLoadJSFunctionCall(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component)
-	 */
 	@Override
 	public void renderBodyOnLoadJSFunctionCall(Renderer renderer,
 			StringOutput sb, Component source, RenderingState rstate) {
diff --git a/src/main/java/org/olat/core/gui/components/rating/RatingRenderer.java b/src/main/java/org/olat/core/gui/components/rating/RatingRenderer.java
index 2b03e28c893382c07d217f49c51a3c87737df78b..1371fe4b1855f4791026d43eada66a8037721e6f 100644
--- a/src/main/java/org/olat/core/gui/components/rating/RatingRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/rating/RatingRenderer.java
@@ -44,14 +44,7 @@ import org.olat.core.util.StringHelper;
  */
 public class RatingRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
index 69a4277bfcd18ce56dc97008c2c2807c60f178ad..7484fec782fc0c032dba94df8757eae7a0dfece1 100644
--- a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
@@ -26,8 +26,10 @@
 
 package org.olat.core.gui.components.table;
 
+import java.io.IOException;
 import java.util.List;
 
+import org.apache.logging.log4j.Logger;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.DefaultComponentRenderer;
 import org.olat.core.gui.components.form.flexible.impl.NameValuePair;
@@ -37,7 +39,6 @@ import org.olat.core.gui.render.Renderer;
 import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.render.URLBuilder;
 import org.olat.core.gui.translator.Translator;
-import org.apache.logging.log4j.Logger;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.StringHelper;
 
@@ -52,10 +53,7 @@ public class TableRenderer extends DefaultComponentRenderer {
 	
 	private static final Logger log = Tracing.createLoggerFor(TableRenderer.class);
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#render(org.olat.core.gui.render.Renderer, org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator, org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
 	@Override
 	public void render(final Renderer renderer, final StringOutput target, final Component source, final URLBuilder ubu, final Translator translator, final RenderResult renderResult,
 			final String[] args) {
@@ -281,9 +279,12 @@ public class TableRenderer extends DefaultComponentRenderer {
 			target.append("\">");
 			String action = cd.getAction(i);
 			if (action != null) {
-				StringOutput so = new StringOutput(100);
-				cd.renderValue(so, i, renderer);
-				appendSingleDataRowActionColumn(target, ubu, table, iframePostEnabled, i, currentPosInModel, j, cd, action, so.toString());
+				try(StringOutput so = new StringOutput(100)) {
+					cd.renderValue(so, i, renderer);
+					appendSingleDataRowActionColumn(target, ubu, table, iframePostEnabled, i, currentPosInModel, j, cd, action, so.toString());
+				} catch(IOException e) {
+					log.error("", e);
+				}
 			} else {
 				cd.renderValue(target, i, renderer);
 			}
diff --git a/src/main/java/org/olat/core/gui/components/text/TextComponentRenderer.java b/src/main/java/org/olat/core/gui/components/text/TextComponentRenderer.java
index 8fbd06a5b114749c5b34501c589d5711324c5b43..c60940c458c0fafe97a789d7e18f4795e1b64f4c 100644
--- a/src/main/java/org/olat/core/gui/components/text/TextComponentRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/text/TextComponentRenderer.java
@@ -43,14 +43,6 @@ import org.olat.core.util.StringHelper;
  */
 class TextComponentRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 			RenderResult renderResult, String[] args) {
diff --git a/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java b/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java
index f98e9376255362517c363c62736d4b9e59c035fa..6b881f555455de806144f1194cf5241afe545eea 100644
--- a/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java
@@ -45,14 +45,7 @@ import org.olat.core.util.Util;
  */
 public class TextBoxListRenderer extends DefaultComponentRenderer {
 
-	/**
-	 * @see org.olat.core.gui.components.ComponentRenderer#render(org.olat.core.gui.render.Renderer,
-	 *      org.olat.core.gui.render.StringOutput,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.render.URLBuilder,
-	 *      org.olat.core.gui.translator.Translator,
-	 *      org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
 	@Override
 	public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator, RenderResult renderResult,
 			String[] args) {
diff --git a/src/main/java/org/olat/core/util/i18n/ui/InlineTranslationInterceptHandlerController.java b/src/main/java/org/olat/core/util/i18n/ui/InlineTranslationInterceptHandlerController.java
index 5ee7ad4a1c0839926ae45ce112ef790424612fff..e9c037a995bc5e39642287f4e9143065925be94a 100644
--- a/src/main/java/org/olat/core/util/i18n/ui/InlineTranslationInterceptHandlerController.java
+++ b/src/main/java/org/olat/core/util/i18n/ui/InlineTranslationInterceptHandlerController.java
@@ -148,41 +148,27 @@ public class InlineTranslationInterceptHandlerController extends BasicController
 				// we save the result in a new var since it is too early to
 				// append it
 				// to the 'stream' right now.
-				StringOutput sbOrig = new StringOutput();
-				try {
+				
+				try(StringOutput sbOrig = new StringOutput()) {
 					originalRenderer.render(renderer, sbOrig, source, ubu, translator, renderResult, args);
+					String rendered = sbOrig.toString();
+					
+					String renderedWithHTMLMarkup = InlineTranslationInterceptHandlerController.replaceLocalizationMarkupWithHTML(rendered,
+							inlineTranslationURLBuilder, getTranslator());
+					sb.append(renderedWithHTMLMarkup);
 				} catch (Exception e) {
 					String emsg = "exception while rendering component '" + source.getComponentName() + "' (" + source.getClass().getName() + ") "
 							+ source.getListenerInfo() + "<br />Message of exception: " + e.getMessage();
-					sbOrig.append("<span style=\"color:red\">Exception</span><br /><pre>" + emsg + "</pre>");
-				}
-
-				String rendered = sbOrig.toString();
-				String renderedWithHTMLMarkup = InlineTranslationInterceptHandlerController.replaceLocalizationMarkupWithHTML(rendered,
-						inlineTranslationURLBuilder, getTranslator());
-				sb.append(renderedWithHTMLMarkup);
+					sb.append("<span style=\"color:red\">Exception</span><br /><pre>" + emsg + "</pre>");
+				}	
 			}
-
-			/**
-			 * @see org.olat.core.gui.components.ComponentRenderer#renderHeaderIncludes(org.olat.core.gui.render.Renderer,
-			 *      org.olat.core.gui.render.StringOutput,
-			 *      org.olat.core.gui.components.Component,
-			 *      org.olat.core.gui.render.URLBuilder,
-			 *      org.olat.core.gui.translator.Translator,
-			 *      org.olat.core.gui.render.RenderingState)
-			 */
+			
 			@Override
 			public void renderHeaderIncludes(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 					RenderingState rstate) {
 				originalRenderer.renderHeaderIncludes(renderer, sb, source, ubu, translator, rstate);
 			}
 
-			/**
-			 * @see org.olat.core.gui.components.ComponentRenderer#renderBodyOnLoadJSFunctionCall(org.olat.core.gui.render.Renderer,
-			 *      org.olat.core.gui.render.StringOutput,
-			 *      org.olat.core.gui.components.Component,
-			 *      org.olat.core.gui.render.RenderingState)
-			 */
 			@Override
 			public void renderBodyOnLoadJSFunctionCall(Renderer renderer, StringOutput sb, Component source, RenderingState rstate) {
 				originalRenderer.renderBodyOnLoadJSFunctionCall(renderer, sb, source, rstate);
diff --git a/src/main/java/org/olat/modules/iq/IQComponentRenderer.java b/src/main/java/org/olat/modules/iq/IQComponentRenderer.java
index 369bb94b337c0c064caf7a9340a6f108e5dbc0ee..325e8f95599fec7a01a6fde9d9f776f2e2a4c340 100644
--- a/src/main/java/org/olat/modules/iq/IQComponentRenderer.java
+++ b/src/main/java/org/olat/modules/iq/IQComponentRenderer.java
@@ -626,10 +626,8 @@ public class IQComponentRenderer implements ComponentRenderer {
 		feedback.render(sbTmp, ri);
 		sb.append(sbTmp);
 	}
-		
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#render(org.olat.core.gui.render.Renderer, org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component, org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator, org.olat.core.gui.render.RenderResult, java.lang.String[])
-	 */
+
+	@Override
 	public void render(Renderer renderer, StringOutput target, Component source, URLBuilder ubu, Translator translator, RenderResult renderResult, String[] args) {
 
 		IQComponent qticomp = (IQComponent)source;
@@ -641,16 +639,12 @@ public class IQComponentRenderer implements ComponentRenderer {
 		}		
 	}
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#renderHeaderIncludes(org.olat.core.gui.render.Renderer, org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component, org.olat.core.gui.render.URLBuilder, org.olat.core.gui.translator.Translator)
-	 */
+	@Override
 	public void renderHeaderIncludes(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator, RenderingState rstate) {
 		//
 	}
 
-	/**
-	 * @see org.olat.core.gui.render.ui.ComponentRenderer#renderBodyOnLoadJSFunctionCall(org.olat.core.gui.render.Renderer, org.olat.core.gui.render.StringOutput, org.olat.core.gui.components.Component)
-	 */
+	@Override
 	public void renderBodyOnLoadJSFunctionCall(Renderer renderer, StringOutput sb, Component source, RenderingState rstate) {
 		//
 	}