diff --git a/main/plugin-web/content-types/_override/org.ametys.web.default.Content.article.xml b/main/plugin-web/content-types/_override/org.ametys.web.default.Content.article.xml
deleted file mode 100644
index 011e201..0000000
--- a/main/plugin-web/content-types/_override/org.ametys.web.default.Content.article.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2012 Anyware Services
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<extension class="org.ametys.cms.contenttype.DefaultContentType">
- <content-type>
-
- <label i18n="true">CONTENT_ARTICLE_LABEL</label>
- <description i18n="true">CONTENT_ARTICLE_DESCRIPTION</description>
- <default-title i18n="true">CONTENT_ARTICLE_DEFAULT_TITLE</default-title>
- <icons>
- <glyph>ametysicon-text70</glyph>
- <small>img/content/article/icon-small.png</small>
- <medium>img/content/article/icon-medium.png</medium>
- <large>img/content/article/icon-large.png</large>
- </icons>
- <css>
- <file plugin="core-ui">font/ametys/AmetysIcon.css</file>
- </css>
-
- <right>Web_Right_Article_Create</right>
-
- <attribute name="title" type="string">
- <label i18n="true">CONTENT_ARTICLE_TITLE</label>
- <description i18n="true">CONTENT_ARTICLE_TITLE_DESC</description>
- <validation>
- <mandatory />
- </validation>
- </attribute>
-
- <attribute name="document-subtitle" type="string">
- <label i18n="true">CONTENT_ARTICLE_SUBTITLE</label>
- <description i18n="true">CONTENT_ARTICLE_SUBTITLE_DESC</description>
- </attribute>
-
- <attribute name="abstract" type="string">
- <label i18n="true">CONTENT_ARTICLE_ABSTRACT</label>
- <description i18n="true">CONTENT_ARTICLE_ABSTRACT_DESC</description>
- <widget>edition.textarea</widget>
- </attribute>
-
- <attribute name="illustration" type="composite">
- <label i18n="true">CONTENT_ARTICLE_ILLUSTRATION</label>
- <description i18n="true">CONTENT_ARTICLE_ILLUSTRATION_DESC</description>
- <attribute name="image" type="file">
- <label i18n="true">CONTENT_ARTICLE_IMAGE</label>
- <description i18n="true">CONTENT_ARTICLE_IMAGE_DESC</description>
- <validation>
- <custom-validator class="org.ametys.cms.data.FileValidator"/>
- </validation>
- <widget>edition.file</widget>
- <widget-params>
- <param name="allowSources">external,resource</param>
- <param name="filter">image</param>
- </widget-params>
- </attribute>
- <attribute name="alt-text" type="string">
- <label i18n="true">CONTENT_ARTICLE_IMAGE_ALT</label>
- <description i18n="true">CONTENT_ARTICLE_IMAGE_ALT_DESC</description>
- </attribute>
- </attribute>
-
- <attribute name="content" type="rich-text">
- <label i18n="true">CONTENT_ARTICLE_CONTENT</label>
- <description i18n="true">CONTENT_ARTICLE_CONTENT_DESC</description>
- <validation>
- <mandatory />
- </validation>
- </attribute>
-
- <attribute name="comment" type="boolean">
- <label i18n="true">CONTENT_ARTICLE_COMMENT</label>
- <description i18n="true">CONTENT_ARTICLE_COMMENT_DESC</description>
- <default-value>false</default-value>
- </attribute>
-
- <attribute name="contact" type="composite">
- <label i18n="true">CONTENT_ARTICLE_AUTHOR</label>
- <description i18n="true">CONTENT_ARTICLE_AUTHOR_DESC</description>
- <attribute name="name" type="string">
- <label i18n="true">CONTENT_ARTICLE_AUTHOR_NAME</label>
- <description i18n="true">CONTENT_ARTICLE_AUTHOR_NAME_DESC</description>
- </attribute>
- <attribute name="mail" type="string">
- <label i18n="true">CONTENT_ARTICLE_AUTHOR_MAIL</label>
- <description i18n="true">CONTENT_ARTICLE_AUTHOR_MAIL_DESC</description>
- <validation>
- <regexp>^.+@.+$</regexp>
- <invalidText i18n="true">PLUGINS_WEB_REGEXP_INVALID_MAIL</invalidText>
- </validation>
- </attribute>
- </attribute>
-
- <dublin-core/>
-
- <!-- Main -->
- <view name="main">
- <item ref="title" />
- <item ref="document-subtitle" />
- <item ref="illustration/*" />
- <item ref="abstract" />
- <item ref="content" />
- <item ref="comment" />
- <item ref="contact/*" />
- <dublin-core/>
- <label i18n="true">plugin.cms:PLUGINS_CMS_VIEW_MAIN</label>
- <description i18n="true">plugin.cms:PLUGINS_CMS_VIEW_MAIN_DESC</description>
- </view>
-
- <!-- Search -->
- <view name="search" internal="true">
- <item ref="title" />
- <item ref="document-subtitle" />
- </view>
-
- <!-- Abstract view -->
- <view name="abstract">
- <item ref="title" />
- <item ref="illustration/*" />
- <item ref="abstract" />
- <item ref="content" />
- <label i18n="true">plugin.cms:PLUGINS_CMS_VIEW_ABSTRACT</label>
- <description i18n="true">plugin.cms:PLUGINS_CMS_VIEW_ABSTRACT_DESC</description>
- </view>
-
- <!-- Link view -->
- <view name="link">
- <item ref="title" />
- <item ref="document-subtitle" />
- <label i18n="true">plugin.cms:PLUGINS_CMS_VIEW_LINK</label>
- <description i18n="true">plugin.cms:PLUGINS_CMS_VIEW_LINK_DESC</description>
- </view>
-
- <!-- Details -->
- <view name="details" internal="true">
- <item ref="title"/>
- <item ref="document-subtitle"/>
- <item ref="contact/*" />
- <dublin-core/>
- </view>
-
- <!-- Index -->
- <view name="index" internal="true">
- <item ref="title" />
- <item ref="document-subtitle" />
- <item ref="illustration/*" />
- <item ref="abstract" />
- <item ref="content" />
- <item ref="comment" />
- <item ref="contact/*" />
- <dublin-core/>
- </view>
-
- <!-- Full search view -->
- <view name="fulltext-search" internal="true">
- <item ref="title" />
- <item ref="document-subtitle" />
- <item ref="abstract" />
- <item ref="content" />
- <dublin-core/>
- </view>
- </content-type>
-</extension>
diff --git a/main/plugin-web/src/org/ametys/web/tags/inputdata/FilteredContentsInputData.java b/main/plugin-web/src/org/ametys/web/tags/inputdata/FilteredContentsInputData.java
index f9e8691..761a367 100644
--- a/main/plugin-web/src/org/ametys/web/tags/inputdata/FilteredContentsInputData.java
+++ b/main/plugin-web/src/org/ametys/web/tags/inputdata/FilteredContentsInputData.java
@@ -217,6 +217,7 @@
request.removeAttribute(GetSiteAction.OVERRIDE_SITE_REQUEST_ATTR);
request.removeAttribute(GetSiteAction.OVERRIDE_SKIN_REQUEST_ATTR);
request.setAttribute("site", currentSiteName);
+ request.setAttribute("siteName", currentSiteName);
request.setAttribute("skin", currentSkinName);
request.setAttribute("template", currentTemplateName);
request.setAttribute("renderingLanguage", currentLanguage);