diff --git a/admin-dev/themes/default/template/controllers/attributes/form.tpl b/admin-dev/themes/default/template/controllers/attributes/form.tpl
index 9de6e6359..ed197e63f 100644
--- a/admin-dev/themes/default/template/controllers/attributes/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/form.tpl
@@ -41,6 +41,9 @@
 			</div>
 		{/if}
 	</div>
+		{if $input.name == 'name'}
+			{hook h="displayAttributeForm" id_attribute=$form_id}
+		{/if}
 {/block}
 
 {block name="script"}
diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl
new file mode 100644
index 000000000..48f2d0e3b
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/attributes_groups/form.tpl
@@ -0,0 +1,34 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helper/form/form.tpl"}
+
+{block name="end_field_block"}
+		</div>
+		{if $input.name == 'public_name'}
+			{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
+		{/if}
+{/block}
diff --git a/admin-dev/themes/default/template/controllers/features/form.tpl b/admin-dev/themes/default/template/controllers/features/form.tpl
new file mode 100644
index 000000000..865c70edd
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/features/form.tpl
@@ -0,0 +1,33 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+{extends file="helper/form/form.tpl"}
+
+{block name="end_field_block"}
+	</div>
+	{if $input.name == 'name'}
+		{hook h="displayFeatureForm" id_feature=$form_id}
+	{/if}
+{/block}
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index 951bf9de9..0a78c83f7 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -1096,7 +1096,7 @@ class BlockLayered extends Module
 		else
 			$smarty->assign('meta_title', $categoryMetas['meta_title']);
 		
-		$metaKeyWordsComplement = substr(str_replace(' – ', ', ', strtolower($title)), 1000);
+		$metaKeyWordsComplement = substr(str_replace(' – ', ', ', strtolower($title)), 0, 1000);
 		if (!empty($metaKeyWordsComplement))
 			$smarty->assign('meta_keywords', rtrim($categoryTitle.', '.$metaKeyWordsComplement.', '.$categoryMetas['meta_keywords'], ', '));