diff --git a/administrator/templates/hathor/css/template.css b/administrator/templates/hathor/css/template.css
index 8bd16f128eeb4..76fe0d1bab4f6 100644
--- a/administrator/templates/hathor/css/template.css
+++ b/administrator/templates/hathor/css/template.css
@@ -3947,3 +3947,6 @@ div.toggle-editor {
 .popover-content {
 	min-height: 33px;
 }
+template {
+	display: none;
+}
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index d385ac7ca0409..9ff0750e6df05 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -9135,3 +9135,6 @@ input:focus,
 		column-count: auto;
 	}
 }
+template {
+   display: none;
+}
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index 66f73fd072c0f..707e30047af64 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -118,21 +118,23 @@ class="btn btn-mini button btn-success group-add group-add-<?php echo $unique_su
 					endforeach; ?>
 				</tbody>
 			</table>
-
-			<?php if ($multiple) : ?>
-				<template class="subform-repeatable-template-section"><?php echo trim(
-					$this->sublayout(
-						$sublayout,
-						array(
-							'form' => $tmpl,
-							'basegroup' => $fieldname,
-							'group' => $fieldname . 'X',
-							'buttons' => $buttons,
-							'unique_subform_id' => $unique_subform_id,
-						)
-					)
-				); ?></template>
-			<?php endif; ?>
+            <?php if ($multiple) : ?>
+                <template class="subform-repeatable-template-section">
+                    <?php
+                    echo htmlspecialchars(trim(
+                            $this->sublayout(
+                                $sublayout,
+                                array(
+                                    'form' => $tmpl,
+                                    'basegroup' => $fieldname,
+                                    'group' => $fieldname . 'X',
+                                    'buttons' => $buttons,
+                                    'unique_subform_id' => $unique_subform_id,
+                                )
+                            ))
+                    ); ?>
+                </template>
+            <?php endif; ?>
 		</div>
 	</div>
 </div>
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index 4569b94af90f4..10b138f1d484f 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -69,20 +69,21 @@
 			);
 		endforeach;
 		?>
-		<?php if ($multiple) : ?>
-			<template class="subform-repeatable-template-section"><?php echo trim(
-				$this->sublayout(
-					$sublayout,
-					array(
-						'form' => $tmpl,
-						'basegroup' => $fieldname,
-						'group' => $fieldname . 'X',
-						'buttons' => $buttons,
-						'unique_subform_id' => $unique_subform_id,
-					)
-				)
-			); ?></template>
-		<?php endif; ?>
+        <?php if ($multiple) : ?>
+            <template class="subform-repeatable-template-section"><?php
+                echo htmlspecialchars(trim(
+                    $this->sublayout(
+                        $sublayout,
+                        array(
+                            'form' => $tmpl,
+                            'basegroup' => $fieldname,
+                            'group' => $fieldname . 'X',
+                            'buttons' => $buttons,
+                            'unique_subform_id' => $unique_subform_id,
+                        )
+                    )
+                )); ?></template>
+        <?php endif; ?>
 		</div>
 	</div>
 </div>
diff --git a/media/system/js/subform-repeatable-uncompressed.js b/media/system/js/subform-repeatable-uncompressed.js
index 123df96b80371..a0fcb67e5e2a5 100644
--- a/media/system/js/subform-repeatable-uncompressed.js
+++ b/media/system/js/subform-repeatable-uncompressed.js
@@ -68,12 +68,6 @@
 			// Find the template element and get its HTML content, this is our template.
 			var $tmplElement = this.$container.find(this.options.rowTemplateSelector).last();
 
-			// Move the template out of the form scope, for IE compatibility.
-			// But only a root template (!!!)
-			if (!$tmplElement.parents(this.options.rowTemplateSelector).length) {
-				$(document.body).append($tmplElement);
-			}
-
 			this.template = $.trim($tmplElement.html()) || '';
 			this.$tmplElement = $tmplElement;
 		}
@@ -105,7 +99,7 @@
 		}
 
 		// make new from template
-		var row = $.parseHTML(this.template);
+		var row = $.parseHTML(htmlspecialchar.decode(this.template));
 
 		//add to container
 		if(after){
@@ -313,5 +307,26 @@
 			$(container || document).find('div.subform-repeatable').subformRepeatable();
 		}
 	});
-
+	window.htmlspecialchar = {
+		/**
+		 * @param {String} str htmlSet entities
+		 **/
+		decode : function(str) {
+			var map = {
+				'&amp;': '&',
+				'&#038;': "&",
+				'&lt;': '<',
+				'&gt;': '>',
+				'&quot;': '"',
+				'&#039;': "'",
+				'&#8217;': "’",
+				'&#8216;': "‘",
+				'&#8211;': "–",
+				'&#8212;': "—",
+				'&#8230;': "…",
+				'&#8221;': '”'
+			};
+			return str.replace(/\&[\w\d\#]{2,5}\;/g, function(m) { return map[m]; });
+		}
+	};
 })(jQuery);
diff --git a/media/system/js/subform-repeatable.js b/media/system/js/subform-repeatable.js
index 1972b8834f1c9..c2896966a2064 100644
--- a/media/system/js/subform-repeatable.js
+++ b/media/system/js/subform-repeatable.js
@@ -1 +1 @@
-(function($){"use strict";$.subformRepeatable=function(container,options){this.$container=$(container);if(this.$container.data("subformRepeatable")){return self}this.$container.data("subformRepeatable",self);this.options=$.extend({},$.subformRepeatable.defaults,options);this.template="";this.prepareTemplate();this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container;var self=this;this.$container.on("click",this.options.btAdd,function(e){e.preventDefault();var after=$(this).parents(self.options.repeatableElement);if(!after.length){after=null}self.addRow(after)});this.$container.on("click",this.options.btRemove,function(e){e.preventDefault();var $row=$(this).parents(self.options.repeatableElement);self.removeRow($row)});if(this.options.btMove){this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"})}this.$container.trigger("subform-ready")};$.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var $tmplElement=this.$container.find(this.options.rowTemplateSelector).last();if(!$tmplElement.parents(this.options.rowTemplateSelector).length){$(document.body).append($tmplElement)}this.template=$.trim($tmplElement.html())||"";this.$tmplElement=$tmplElement}else{var row=this.$container.find(this.options.repeatableElement).get(0),$row=$(row).clone();try{this.clearScripts($row)}catch(e){if(window.console){console.log(e)}}this.template=$row.prop("outerHTML")}};$.subformRepeatable.prototype.addRow=function(after){var count=this.$containerRows.find(this.options.repeatableElement).length;if(count>=this.options.maximum){return null}var row=$.parseHTML(this.template);if(after){$(after).after(row)}else{this.$containerRows.append(row)}var $row=$(row);$row.attr("data-new","true");this.fixUniqueAttributes($row,count);try{this.fixScripts($row)}catch(e){if(window.console){console.log(e)}}this.$container.trigger("subform-row-add",$row);return $row};$.subformRepeatable.prototype.removeRow=function($row){var count=this.$containerRows.find(this.options.repeatableElement).length;if(count<=this.options.minimum){return}this.$container.trigger("subform-row-remove",$row);$row.remove()};$.subformRepeatable.prototype.fixUniqueAttributes=function($row,_count,_group,_basename){var group=typeof _group==="undefined"?$row.attr("data-group"):_group,basename=typeof _basename==="undefined"?$row.attr("data-base-name"):_basename,count=typeof _count==="undefined"?0:_count,groupnew=basename+count;$row.attr("data-group",groupnew);var haveName=$row.find("[name]"),ids={};for(var i=0,l=haveName.length;i<l;i++){var $el=$(haveName[i]),name=$el.attr("name"),id=name.replace(/(\[\]$)/g,"").replace(/(\]\[)/g,"__").replace(/\[/g,"_").replace(/\]/g,""),nameNew=name.replace("["+group+"][","["+groupnew+"]["),idNew=id.replace(group,groupnew),countMulti=0,forOldAttr=id;if($el.prop("type")==="checkbox"&&name.match(/\[\]$/)){countMulti=ids[id]?ids[id].length:0;if(!countMulti){$el.closest("fieldset.checkboxes").attr("id",idNew);$row.find('label[for="'+id+'"]').attr("for",idNew).attr("id",idNew+"-lbl")}forOldAttr=forOldAttr+countMulti;idNew=idNew+countMulti}else if($el.prop("type")==="radio"){countMulti=ids[id]?ids[id].length:0;if(!countMulti){$el.closest("fieldset.radio").attr("id",idNew);$row.find('label[for="'+id+'"]').attr("for",idNew).attr("id",idNew+"-lbl")}forOldAttr=forOldAttr+countMulti;idNew=idNew+countMulti}if(ids[id]){ids[id].push(true)}else{ids[id]=[true]}$el.attr("name",nameNew);$el.attr("id",idNew);$row.find('label[for="'+forOldAttr+'"]').attr("for",idNew).attr("id",idNew+"-lbl")}var nestedTemplates=$row.find(this.options.rowTemplateSelector);for(var j=0;j<nestedTemplates.length;j++){var nestedTemplate=$($(nestedTemplates[j]).prop("content"));this.fixUniqueAttributes(nestedTemplate,count,group,basename)}};$.subformRepeatable.prototype.clearScripts=function($row){if($.fn.chosen){$row.find("select.chzn-done").each(function(){var $el=$(this);$el.next(".chzn-container").remove();$el.show().addClass("fix-chosen")})}};$.subformRepeatable.prototype.fixScripts=function($row){$row.find('a[onclick*="jInsertFieldValue"]').each(function(){var $el=$(this),inputId=$el.siblings('input[type="text"]').attr("id"),$select=$el.prev(),oldHref=$select.attr("href");$el.attr("onclick","jInsertFieldValue('', '"+inputId+"');return false;");$select.attr("href",oldHref.replace(/&fieldid=(.+)&/,"&fieldid="+inputId+"&"))})};$.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"template.subform-repeatable-template-section",rowsContainer:null};$.fn.subformRepeatable=function(options){return this.each(function(){var options=options||{},data=$(this).data();if(data.subformRepeatable){return}for(var p in data){if(data.hasOwnProperty(p)){options[p]=data[p]}}var inst=new $.subformRepeatable(this,options);$(this).data("subformRepeatable",inst)})};$(function($){initSubform();$(document).on("subform-row-add",initSubform);function initSubform(event,container){$(container||document).find("div.subform-repeatable").subformRepeatable()}})})(jQuery);
+!function(t){"use strict";t.subformRepeatable=function(e,o){if(this.$container=t(e),this.$container.data("subformRepeatable"))return r;this.$container.data("subformRepeatable",r),this.options=t.extend({},t.subformRepeatable.defaults,o),this.template="",this.prepareTemplate(),this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container;var r=this;this.$container.on("click",this.options.btAdd,function(e){e.preventDefault();var o=t(this).parents(r.options.repeatableElement);o.length||(o=null),r.addRow(o)}),this.$container.on("click",this.options.btRemove,function(e){e.preventDefault();var o=t(this).parents(r.options.repeatableElement);r.removeRow(o)}),this.options.btMove&&this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"}),this.$container.trigger("subform-ready")},t.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var e=this.$container.find(this.options.rowTemplateSelector).last();this.template=t.trim(e.html())||"",this.$tmplElement=e}else{var o=this.$container.find(this.options.repeatableElement).get(0),r=t(o).clone();try{this.clearScripts(r)}catch(t){window.console&&console.log(t)}this.template=r.prop("outerHTML")}},t.subformRepeatable.prototype.addRow=function(e){var o=this.$containerRows.find(this.options.repeatableElement).length;if(o>=this.options.maximum)return null;var r=t.parseHTML(htmlspecialchar.decode(this.template));e?t(e).after(r):this.$containerRows.append(r);var a=t(r);a.attr("data-new","true"),this.fixUniqueAttributes(a,o);try{this.fixScripts(a)}catch(t){window.console&&console.log(t)}return this.$container.trigger("subform-row-add",a),a},t.subformRepeatable.prototype.removeRow=function(t){this.$containerRows.find(this.options.repeatableElement).length<=this.options.minimum||(this.$container.trigger("subform-row-remove",t),t.remove())},t.subformRepeatable.prototype.fixUniqueAttributes=function(e,o,r,a){var i=void 0===r?e.attr("data-group"):r,n=void 0===a?e.attr("data-base-name"):a,s=void 0===o?0:o,l=n+s;e.attr("data-group",l);for(var p=e.find("[name]"),c={},f=0,h=p.length;f<h;f++){var u=t(p[f]),m=u.attr("name"),d=m.replace(/(\[\]$)/g,"").replace(/(\]\[)/g,"__").replace(/\[/g,"_").replace(/\]/g,""),b=m.replace("["+i+"][","["+l+"]["),v=d.replace(i,l),w=0,g=d;"checkbox"===u.prop("type")&&m.match(/\[\]$/)?((w=c[d]?c[d].length:0)||(u.closest("fieldset.checkboxes").attr("id",v),e.find('label[for="'+d+'"]').attr("for",v).attr("id",v+"-lbl")),g+=w,v+=w):"radio"===u.prop("type")&&((w=c[d]?c[d].length:0)||(u.closest("fieldset.radio").attr("id",v),e.find('label[for="'+d+'"]').attr("for",v).attr("id",v+"-lbl")),g+=w,v+=w),c[d]?c[d].push(!0):c[d]=[!0],u.attr("name",b),u.attr("id",v),e.find('label[for="'+g+'"]').attr("for",v).attr("id",v+"-lbl")}for(var R=e.find(this.options.rowTemplateSelector),$=0;$<R.length;$++){var y=t(t(R[$]).prop("content"));this.fixUniqueAttributes(y,s,i,n)}},t.subformRepeatable.prototype.clearScripts=function(e){t.fn.chosen&&e.find("select.chzn-done").each(function(){var e=t(this);e.next(".chzn-container").remove(),e.show().addClass("fix-chosen")})},t.subformRepeatable.prototype.fixScripts=function(e){e.find('a[onclick*="jInsertFieldValue"]').each(function(){var e=t(this),o=e.siblings('input[type="text"]').attr("id"),r=e.prev(),a=r.attr("href");e.attr("onclick","jInsertFieldValue('', '"+o+"');return false;"),r.attr("href",a.replace(/&fieldid=(.+)&/,"&fieldid="+o+"&"))})},t.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"template.subform-repeatable-template-section",rowsContainer:null},t.fn.subformRepeatable=function(e){return this.each(function(){var e=e||{},o=t(this).data();if(!o.subformRepeatable){for(var r in o)o.hasOwnProperty(r)&&(e[r]=o[r]);var a=new t.subformRepeatable(this,e);t(this).data("subformRepeatable",a)}})},t(function(t){function e(e,o){t(o||document).find("div.subform-repeatable").subformRepeatable()}e(),t(document).on("subform-row-add",e)}),window.htmlspecialchar={decode:function(t){var e={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"};return t.replace(/\&[\w\d\#]{2,5}\;/g,function(t){return e[t]})}}}(jQuery);