diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig
index 8566c684..991ff27b 100644
--- a/trunk/app/Resources/views/base.html.twig
+++ b/trunk/app/Resources/views/base.html.twig
@@ -23,7 +23,14 @@
{%- if page is defined and page.description is not empty -%}
{%- elseif app.debug -%}
-
+
+ {%- endif -%}
+ {%- endblock %}
+ {% block meta_keywords -%}
+ {%- if page is defined and page.keywords is not empty -%}
+
+ {%- elseif app.debug -%}
+
{%- endif -%}
{%- endblock %}
{% block meta_robots %}
diff --git a/trunk/app/Resources/views/default/pages/home.html.twig b/trunk/app/Resources/views/default/pages/home.html.twig
index 3211b6c2..941f56f8 100644
--- a/trunk/app/Resources/views/default/pages/home.html.twig
+++ b/trunk/app/Resources/views/default/pages/home.html.twig
@@ -1,7 +1,10 @@
{% extends 'base.html.twig' %}
-{% block canonical_url %}
- {% set canonical_url = get_base_url() ~ '/' %}
+{% block meta_description %}
+
+{% endblock %}
+{% block meta_keywords %}
+
{% endblock %}
{% block header2 %}