diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/boolean_radio_widget_template.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/boolean_radio_widget_template.xhtml
index 3a3f784..574bc98 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/boolean_radio_widget_template.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/boolean_radio_widget_template.xhtml
@@ -1,10 +1,11 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:c="http://java.sun.com/jstl/core"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
   xmlns:nxu="http://nuxeo.org/nxweb/util"
   xmlns:nxdir="http://nuxeo.org/nxdirectory"
-  xmlns:nxl="http://nuxeo.org/nxforms/layout" id="#{widget.id}">
+  xmlns:nxl="http://nuxeo.org/nxforms/layout"
+  id="#{widget.id}">
 
   <c:if test="#{widget.mode == 'edit' }">
     <h:selectOneRadio value="#{field}" id="#{widget.id}_checkbox">
@@ -21,4 +22,4 @@
       value="#{messages['label.no']}" />
   </c:if>
 
-</f:subview>
\ No newline at end of file
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/contributors_widget.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/contributors_widget.xhtml
index 2c2559c..4ba4baf 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/contributors_widget.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/contributors_widget.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
   xmlns:nxu="http://nuxeo.org/nxweb/util"
@@ -34,4 +34,4 @@
     </c:forEach>
   </div>
 </c:if>
-</f:subview>
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
index 70cfd5e..399d35d 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/coverage_widget.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:c="http://java.sun.com/jstl/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
@@ -54,4 +54,4 @@
     id="#{widget.id}_message" />
 
 </c:if>
-</f:subview>
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_file_widget.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_file_widget.xhtml
index e45461a..57ef128 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_file_widget.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_file_widget.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:c="http://java.sun.com/jstl/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
@@ -64,4 +64,4 @@
 
   </c:if>
 
-</f:subview>
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_subfile_widget.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_subfile_widget.xhtml
index 3f73e47..8c7c5f9 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_subfile_widget.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/extended_subfile_widget.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:c="http://java.sun.com/jstl/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
@@ -67,4 +67,4 @@
 
   </c:if>
 
-</f:subview>
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/files_list_widget_template.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/files_list_widget_template.xhtml
index 86a05b4..1786d46 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/files_list_widget_template.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/files_list_widget_template.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:c="http://java.sun.com/jstl/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
@@ -82,4 +82,4 @@
 
   </c:if>
 
-</f:subview>
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/moderation_type_widget_template.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/moderation_type_widget_template.xhtml
index bb71015..3be283b 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/moderation_type_widget_template.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/moderation_type_widget_template.xhtml
@@ -1,14 +1,14 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:c="http://java.sun.com/jstl/core"
-  xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
-  xmlns:nxu="http://nuxeo.org/nxweb/util"
-  xmlns:nxdir="http://nuxeo.org/nxdirectory"
-  xmlns:nxl="http://nuxeo.org/nxforms/layout" id="#{widget.id}">
+  id="#{widget.id}">
 
-  <h:selectOneRadio id="#{widget.id}_field0" value="#{field}" >
-    <f:selectItem id="#{widget.id}_item1" itemLabel="#{messages['label.apriori']}" itemValue="apriori" />
-    <f:selectItem id="#{widget.id}_item2" itemLabel="#{messages['label.aposteriori']}" itemValue="aposteriori" />
+  <h:selectOneRadio id="#{widget.id}" value="#{field}" >
+    <f:selectItem id="#{widget.id}_item1"
+      itemLabel="#{messages['label.apriori']}"
+      itemValue="apriori" />
+    <f:selectItem id="#{widget.id}_item2"
+      itemLabel="#{messages['label.aposteriori']}"
+      itemValue="aposteriori" />
   </h:selectOneRadio>
   
-</f:subview>
\ No newline at end of file
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/nolabel_list_widget_template.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/nolabel_list_widget_template.xhtml
index 11e6686..c4cd98b 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/nolabel_list_widget_template.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/nolabel_list_widget_template.xhtml
@@ -5,73 +5,8 @@
   xmlns:nxdir="http://nuxeo.org/nxdirectory"
   xmlns:nxl="http://nuxeo.org/nxforms/layout"
   id="#{widget.id}">
-
-  <f:subview rendered="#{widget.mode != 'create' and widget.mode != 'edit'}">
-
-    <h:dataTable value="#{field}" var="item" rendered="#{not empty field}"
-      id="#{widget.id}_table">
-      <h:column>
-        <h:panelGrid columnClasses="fieldColumn">
-          <nxl:subWidget>
-            <nxl:widget widget="#{subWidget}"
-              value="#{item}" />
-          </nxl:subWidget>
-        </h:panelGrid>
-      </h:column>
-    </h:dataTable>
-
-  </f:subview>
-
-  <f:subview rendered="#{widget.mode == 'create' or widget.mode == 'edit'}">
-
-    <a4j:region renderRegionOnly="true" id="#{widget.id}_region">
-      <a4j:outputPanel ajaxRendered="true">
-        <nxu:inputList value="#{field}" id="#{widget.id}_input" model="model"
-          template="#{nxd:defaultValue(widget.fieldDefinitions[0].schemaName, widget.fieldDefinitions[0].fieldName)}"
-          required="#{widget.required}">
-
-          <h:panelGrid columns="2">
-            <a4j:commandLink immediate="true"
-              actionListener="#{editableListBean.performAction}"
-              id="#{widget.id}_delete" reRender="#{widget.id}_input"
-              bypassUpdates="true">
-              <h:graphicImage value="/icons/action_delete.gif" />
-              <f:param name="for" value="#{widget.id}_input" />
-              <f:param name="index" value="#{model.rowIndex}" />
-              <f:param name="type" value="remove" />
-            </a4j:commandLink>
-
-            <h:panelGroup>
-              <h:panelGrid columns="1">
-
-                <nxl:subWidget>
-                  <h:outputText value="#{messages[subWidget.label]}"
-                    styleClass="labelColumn" />
-                  <nxl:widget widget="#{subWidget}"
-                    value="#{model.rowData}" />
-                </nxl:subWidget>
-
-              </h:panelGrid>
-
-            </h:panelGroup>
-
-          </h:panelGrid>
-
-        </nxu:inputList>
-        <h:message styleClass="errorMessage" for="#{widget.id}_input"
-          id="#{widget.id}_message" />
-      </a4j:outputPanel>
-
-      <a4j:commandLink immediate="true"
-        actionListener="#{editableListBean.performAction}" id="#{widget.id}_add">
-        <f:param name="for" value="#{widget.id}_input" />
-        <f:param name="type" value="add" />
-        <h:graphicImage value="/widgets/img/action_add.gif" />
-        <h:outputText value="#{messages['command.add']}" />
-      </a4j:commandLink>
-
-    </a4j:region>
-
-  </f:subview>
+  
+  <em>The template 'nolabel_list_widget_template.xhtml' is deprecated, use
+  'list_widget_template.xhtml' instead</em>
 
 </f:subview>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/site_url_widget_template.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/site_url_widget_template.xhtml
index 1b0c598..3f96525 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/site_url_widget_template.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/site_url_widget_template.xhtml
@@ -1,13 +1,8 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
-  xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:c="http://java.sun.com/jstl/core"
-  xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
-  xmlns:nxu="http://nuxeo.org/nxweb/util"
-  xmlns:nxdir="http://nuxeo.org/nxdirectory"
-  xmlns:nxl="http://nuxeo.org/nxforms/layout" id="#{widget.id}">
+<span xmlns:h="http://java.sun.com/jsf/html"
+  id="#{widget.id}">
 
   <h:outputLink value="#{baseURL}site/sites/#{field}" target="_blank">
     <h:outputText value="#{field}" />
   </h:outputLink>
 
-</f:subview>
+</span>
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/subjects_widget.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/subjects_widget.xhtml
index e7c9e8b..4f33ebb 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/subjects_widget.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/subjects_widget.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:f="http://java.sun.com/jsf/core"
+<span xmlns:f="http://java.sun.com/jsf/core"
   xmlns:c="http://java.sun.com/jstl/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
@@ -72,4 +72,4 @@
   </a4j:outputPanel>
 
 </c:if>
-</f:subview>
+</span>
\ No newline at end of file
diff --git a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/title_with_permlink_widget_template.xhtml b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/title_with_permlink_widget_template.xhtml
index 4d6286a..12b187b 100644
--- a/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/title_with_permlink_widget_template.xhtml
+++ b/nuxeo-platform-webapp/src/main/resources/web/nuxeo.war/widgets/title_with_permlink_widget_template.xhtml
@@ -1,4 +1,4 @@
-<f:subview xmlns:h="http://java.sun.com/jsf/html"
+<span xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:nxu="http://nuxeo.org/nxweb/util"
   xmlns:nxh="http://nuxeo.org/nxweb/html"
@@ -58,4 +58,4 @@
 
   </h1>
 
-</f:subview>
\ No newline at end of file
+</span>
\ No newline at end of file