diff --git a/APPL/Shared/default.xsl b/APPL/Shared/default.xsl
index 3adbf6b3f9..2457774256 100644
--- a/APPL/Shared/default.xsl
+++ b/APPL/Shared/default.xsl
@@ -76,17 +76,11 @@
 
   <msxsl:script language="JScript" implements-prefix="fclt">
 <![CDATA[
-    String.prototype.format = function()
-    {
-        var formatted = this;
-        for (var i = 0; i < arguments.length; i++)
-        {
-            if (typeof arguments[i] == "string")
-              arguments[i] = arguments[i].replace(/\$/g, '$$$$');
-            var regexp = new RegExp('\\{'+i+'\\}', 'gi');
-            formatted = formatted.replace(regexp, arguments[i]);
-        }
-        return formatted;
+    String.prototype.format = function() {
+        var args = arguments;
+        return this.replace(/\{(\d+)\}/gi, function (match, d) {
+            return args.length > d ? args[d] : match;
+        });
     };
 
     var safe = {
@@ -215,6 +209,19 @@
           }
         }
 
+        // Checking for [img] src [/img]
+        // Deze strippen we ipv parsen, da's net wat makkelijker
+        strre = "\\[img\\]([\\S\\s]*?)\\[\\/img\\]";
+        matched = safehtml.match(new RegExp(strre, "gi"));
+        if (matched != null) {
+          for (var i = 0; i < matched.length; i++) {
+            var groups = matched[i].match(new RegExp(strre, "i")); // Zonder 'g'lobal-flag
+            if (groups) {
+              safehtml = safehtml.replace(matched[i], "[Image]");
+            }
+          }
+        }
+
         for (var i = 0; i < safepairs.length; i++)
         {
             var code = safepairs[i];