diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index dd54fc1f22..b973d027c7 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -22,9 +22,9 @@
  *
  * @ToDo supported customized templates stored in DB, currently we only support xet files stored in filesystem
  */
-class etemplate extends etemplate_old {};
-class etemplate_new extends etemplate_widget_template
-//class etemplate extends etemplate_widget_template
+//class etemplate extends etemplate_old {};
+//class etemplate_new extends etemplate_widget_template
+class etemplate extends etemplate_widget_template
 {
 	/**
 	 * Are we running as sitemgr module or not
diff --git a/etemplate/js/et2_core_arrayMgr.js b/etemplate/js/et2_core_arrayMgr.js
index 7c442f1274..e79918650d 100644
--- a/etemplate/js/et2_core_arrayMgr.js
+++ b/etemplate/js/et2_core_arrayMgr.js
@@ -381,7 +381,8 @@ var et2_readonlysArrayMgr = et2_arrayMgr.extend({
 		}
 
 		// Otherwise return the default value
-		return (typeof this.getEntry("__ALL__") != "undefined");
+		entry = this.getEntry("__ALL__");
+		return entry !== null && (typeof entry != "undefined");
 	}
 
 });
diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js
index 0245b59876..9d33fd92a0 100644
--- a/etemplate/js/et2_core_widget.js
+++ b/etemplate/js/et2_core_widget.js
@@ -817,7 +817,7 @@ var et2_widget = Class.extend({
 
 			// Check whether the manager has a namespace for the id of this object
 			var entry = mgr.getEntry(this.id);
-			if (typeof entry === 'object' && entry !== null)
+			if (typeof entry === 'object' && entry !== null||this.id )
 			{
 				// The content manager has an own node for this object, so
 				// create an own perspective.
diff --git a/etemplate/js/et2_widget_template.js b/etemplate/js/et2_widget_template.js
index 0cf0fba69e..10c86c415f 100644
--- a/etemplate/js/et2_widget_template.js
+++ b/etemplate/js/et2_widget_template.js
@@ -55,7 +55,7 @@ var et2_template = et2_DOMWidget.extend({
 		},
 	},
 
-	createNamespace: true,
+	createNamespace: false,
 
 	/**
 	 * Initializes this template widget as a simple container.