diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig
index 29bccc7716..887b29ec03 100644
--- a/templates/web/account/account.html.twig
+++ b/templates/web/account/account.html.twig
@@ -1,6 +1,6 @@
 {% extends "account/base.html.twig" %}
 
-{% import "common/macros.html.twig" as auth_macro %}
+{% import "common/macro_flashes.html.twig" as macro_flashes %}
 
 {% set selected = "informations" %}
 
@@ -25,7 +25,7 @@
 {% block content_account %}
     <div class="row-fluid">
         <div class="span12">
-            {{ auth_macro.flashes() }}
+            {{ macro_flashes.flashes() }}
             <form name="account" id="account" class="form-horizontal" action="{{ path("submit_update_account") }}" method="post">
                 <div class="row-fluid">
                     <div class="span12 well well-small" id="phr-account" style="background: #191919;border: 1px solid #333333;">
diff --git a/templates/web/account/change-password.html.twig b/templates/web/account/change-password.html.twig
index 93ae08b162..3a285d5a4d 100644
--- a/templates/web/account/change-password.html.twig
+++ b/templates/web/account/change-password.html.twig
@@ -1,6 +1,6 @@
 {% extends "login/layout/sidebar-layout.html.twig" %}
 
-{% import "common/macros.html.twig" as account_macro %}
+{% import "common/macro_flashes.html.twig" as macro_flashes %}
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
@@ -18,7 +18,7 @@
         </div>
         <div class="row-fluid">
             <div class="span12">
-                {{ account_macro.flashes() }}
+                {{ macro_flashes.flashes() }}
                 <form
                     novalidate
                     name="passwordChangeForm"
diff --git a/templates/web/account/reset-email.html.twig b/templates/web/account/reset-email.html.twig
index ae8056b801..6df5c87480 100644
--- a/templates/web/account/reset-email.html.twig
+++ b/templates/web/account/reset-email.html.twig
@@ -1,6 +1,6 @@
 {% extends "account/base.html.twig" %}
 
-{% import "common/macros.html.twig" as auth_macro %}
+{% import "common/macro_flashes.html.twig" as macro_flashes %}
 
 {% block title %}
     {{ "Change my email address" | trans }}
@@ -15,7 +15,7 @@
 {% block content_account %}
     <div class="row-fluid">
         <div class="span12">
-            {{ auth_macro.flashes() }}
+            {{ macro_flashes.flashes() }}
             <form method="POST" action="{{ path("reset_email") }}" id="mainform" name="changeEmail" class="form-horizontal" style="background: #191919;border: 1px solid #333333;padding-top:20px">
                 <div class="control-group">
                     <label class="control-label" for="form_login">{{ "admin::compte-utilisateur identifiant" | trans }}</label>
diff --git a/templates/web/common/caption.html.twig b/templates/web/common/caption.html.twig
index 51f277901c..0a71994974 100644
--- a/templates/web/common/caption.html.twig
+++ b/templates/web/common/caption.html.twig
@@ -1,21 +1,21 @@
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 {% set business = granted_on_collection(record.baseId, [constant('\\ACL::CANMODIFRECORD')]) %}
 {% set display_exif = true %}
 
 {% if view == 'answer' %}
-    {{ macro.caption(record, business, display_exif) }}
+    {{ macro_caption.caption(record, business, display_exif) }}
 {% elseif view == 'lazaret' %}
-    {{ macro.caption(record, business, display_exif) }}
+    {{ macro_caption.caption(record, business, display_exif) }}
 {% elseif view == 'preview' %}
     {% set display_exif = false %}
-    {{ macro.caption(record, business, display_exif, true) }}
+    {{ macro_caption.caption(record, business, display_exif, true) }}
 {% elseif view == 'basket' %}
     {% set display_exif = false %}
-    {{ macro.caption(record, business, display_exif) }}
+    {{ macro_caption.caption(record, business, display_exif) }}
 {% elseif view == 'overview' %}
     {% set display_exif = false %}
-    {{ macro.caption(record, business, display_exif) }}
+    {{ macro_caption.caption(record, business, display_exif) }}
 {% elseif view == 'publi' %}
-    {{ macro.caption(record, business, display_exif) }}
+    {{ macro_caption.caption(record, business, display_exif) }}
 {% endif %}
diff --git a/templates/web/common/macros.html.twig b/templates/web/common/macro_captcha.html.twig
similarity index 59%
rename from templates/web/common/macros.html.twig
rename to templates/web/common/macro_captcha.html.twig
index 28a0a31f81..f1168ed1bd 100644
--- a/templates/web/common/macros.html.twig
+++ b/templates/web/common/macro_captcha.html.twig
@@ -67,72 +67,3 @@
         <input type="hidden" name="recaptcha_response_field" value="manual_challenge">
     </noscript>
 {% endmacro %}
-
-{% macro flashes() %}
-    {% for type in app.getAvailableFlashTypes %}
-        {% for message in app.getFlash(type) %}
-            <div class="alert alert-{{ type }}">
-                <table>
-                    <tr>
-                        <td class="alert-block-logo">
-                            <i class="fa-2x icon-white fa fa-exclamation-circle" aria-hidden="true"></i>
-                        </td>
-                        <td class="alert-block-content">{{ message }}</td>
-                        <td class="alert-block-close">
-                            <a href="#"><b>&times;</b></a>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        {% endfor %}
-    {% endfor %}
-{% endmacro %}
-
-{% macro caption_value(field, bounceable) %}
-    {% autoescape false %}
-    {% set terms = [] %}
-    {% for data in field.values %}
-        {% if data.from_thesaurus and bounceable %}
-            {% set value = data.value|e|bounce(field.name, data.qjs, field.sbas_id)|parseColor %}
-        {% else %}
-            {% set value = data.value|e|parseColor %}
-        {% endif %}
-        {% set terms = [value]|merge(terms) %}
-    {% endfor %}
-    {{ terms|join(' ; ') }}
-    {% endautoescape %}
-{% endmacro %}
-
-{% macro caption_field(field, bounceable, extra_classes) %}
-    <div class="desc {{ extra_classes|join(' ') }}">
-        <b>{{ field.label_name }}</b> :
-        {{ _self.caption_value(field, bounceable|default(true))|highlight|linkify }}
-    </div>
-{% endmacro %}
-
-{% macro format_caption(record, highlight, search_engine, include_business, bounceable, technical_data) %}
-    {% for field in record.get_caption().get_highlight_fields(null, include_business) %}
-        {% set extra_classes = ['pair'] %}
-        {% if loop.index is odd %}
-            {% set extra_classes = ['impair'] %}
-        {% endif %}
-        {{ _self.caption_field(field, bounceable|default(true), extra_classes) }}
-    {% endfor %}
-    {% if technical_data|default(true) and app.getAuthenticatedUser() is not none and app['settings'].getUserSetting(app.getAuthenticatedUser(), 'technical_display') == 'group' %}
-        <hr/>
-        {% include 'common/technical_datas.html.twig' %}
-    {% endif %}
-{% endmacro %}
-
-{% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
-    <dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
-        {% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
-            <dt>{{ caption_field_label(record, name) }}</dt>
-            <dd>{{ caption_field(record, name, value)|e|highlight|linkify|parseColor }}</dd>
-        {% endfor %}
-    </dl>
-    {% if display_exif|default(true) and app.getAuthenticator().user is not none and user_setting('technical_display') == 'group' %}
-        <hr/>
-        {% include 'common/technical_datas.html.twig' %}
-    {% endif %}
-{% endmacro %}
diff --git a/templates/web/common/macro_caption.html.twig b/templates/web/common/macro_caption.html.twig
new file mode 100644
index 0000000000..21a1fab40d
--- /dev/null
+++ b/templates/web/common/macro_caption.html.twig
@@ -0,0 +1,12 @@
+{% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
+    <dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
+        {% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
+            <dt>{{ caption_field_label(record, name) }}</dt>
+            <dd>{{ caption_field(record, name, value)|e|highlight|linkify|parseColor }}</dd>
+        {% endfor %}
+    </dl>
+    {% if display_exif|default(true) and app.getAuthenticator().user is not none and user_setting('technical_display') == 'group' %}
+        <hr/>
+        {% include 'common/technical_datas.html.twig' %}
+    {% endif %}
+{% endmacro %}
diff --git a/templates/web/common/macro_flashes.html.twig b/templates/web/common/macro_flashes.html.twig
new file mode 100644
index 0000000000..8d5ea2e393
--- /dev/null
+++ b/templates/web/common/macro_flashes.html.twig
@@ -0,0 +1,19 @@
+{% macro flashes() %}
+    {% for type in app.getAvailableFlashTypes %}
+        {% for message in app.getFlash(type) %}
+            <div class="alert alert-{{ type }}">
+                <table>
+                    <tr>
+                        <td class="alert-block-logo">
+                            <i class="fa-2x icon-white fa fa-exclamation-circle" aria-hidden="true"></i>
+                        </td>
+                        <td class="alert-block-content">{{ message }}</td>
+                        <td class="alert-block-close">
+                            <a href="#"><b>&times;</b></a>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        {% endfor %}
+    {% endfor %}
+{% endmacro %}
diff --git a/templates/web/lightbox/IE6/feed.html.twig b/templates/web/lightbox/IE6/feed.html.twig
index eb76cafc57..4b5e132c4c 100644
--- a/templates/web/lightbox/IE6/feed.html.twig
+++ b/templates/web/lightbox/IE6/feed.html.twig
@@ -1,7 +1,7 @@
 {% extends "lightbox/index_layout.html.twig" %}
 
 {% import 'common/thumbnail.html.twig' as thumbnail %}
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 {% block javascript %}
     <script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script>
@@ -84,7 +84,7 @@
                         <div class="lightbox_container">
               {% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), constant('\\ACL::CANMODIFRECORD')) %}
               {% if first_item %}
-                {{macro.caption(first_item.getRecord(app), business, false)}}
+                {{ macro_caption.caption(first_item.getRecord(app), business, false) }}
               {% endif %}
             </div>
                     </div>
diff --git a/templates/web/lightbox/IE6/validate.html.twig b/templates/web/lightbox/IE6/validate.html.twig
index 10e36c5899..bb60a470f3 100644
--- a/templates/web/lightbox/IE6/validate.html.twig
+++ b/templates/web/lightbox/IE6/validate.html.twig
@@ -1,7 +1,7 @@
 {% extends "lightbox/index_layout.html.twig" %}
 
 {% import 'common/thumbnail.html.twig' as thumbnail %}
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 {% block javascript %}
     <script type="text/javascript" src="/assets/common/js/common{% if not app.debug %}.min{% endif %}.js"></script>
@@ -95,7 +95,7 @@
                         <div class="lightbox_container">
               {% if basket_element %}
                 {% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(basket_element.getRecord(app).get_base_id(), constant('\\ACL::CANMODIFRECORD')) %}
-                {{macro.caption(basket_element.getRecord(app), business, false)}}
+                {{ macro_caption.caption(basket_element.getRecord(app), business, false) }}
               {% endif %}
             </div>
                     </div>
diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig
index 721797b88b..0dc742d47d 100644
--- a/templates/web/lightbox/feed.html.twig
+++ b/templates/web/lightbox/feed.html.twig
@@ -1,7 +1,7 @@
 {% extends "lightbox/index_layout.html.twig" %}
 
 {% import 'common/thumbnail.html.twig' as thumbnail %}
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 {% block javascript %}
     <script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
@@ -81,7 +81,7 @@
                         <div class="lightbox_container PNB">
               {% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), constant('\\ACL::CANMODIFRECORD')) %}
               {% if first_item %}
-                {{macro.caption(first_item.getRecord(app), business, false, true)}}
+                {{ macro_caption.caption(first_item.getRecord(app), business, false, true) }}
               {% endif %}
             </div>
                     </div>
diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig
index 5ca17f41c5..fbb1561817 100644
--- a/templates/web/lightbox/validate.html.twig
+++ b/templates/web/lightbox/validate.html.twig
@@ -1,7 +1,7 @@
 {% extends "lightbox/index_layout.html.twig" %}
 
 {% import 'common/thumbnail.html.twig' as thumbnail %}
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 {% block javascript %}
     <script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
@@ -95,7 +95,7 @@
                         <div class="lightbox_container PNB">
               {% if basket_element %}
                 {% set business =  app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(basket_element.getRecord(app).get_base_id(), constant('\\ACL::CANMODIFRECORD')) %}
-                {{macro.caption(basket_element.getRecord(app), business, false, true)}}
+                {{ macro_caption.caption(basket_element.getRecord(app), business, false, true) }}
               {% endif %}
             </div>
                     </div>
diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig
index 4cbe37ba8f..6cca5039fe 100644
--- a/templates/web/login/index.html.twig
+++ b/templates/web/login/index.html.twig
@@ -1,6 +1,6 @@
 {% extends "login/layout/sidebar-layout.html.twig" %}
 
-{% import "common/macros.html.twig" as macro %}
+{% import "common/macro_captcha.html.twig" as macro_captcha %}
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block main_title %}
@@ -70,10 +70,11 @@
                             {{ "Forgot password?" | trans }}
                         </a>
                     </div>
+
                     {% if recaptcha_display %}
                         <div class="row-fluid">
                             <div class="span12">
-                                {{ macro.captcha() }}
+                                {{ macro_captcha.captcha() }}
                             </div>
                         </div>
                     {% endif %}
diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig
index adce1a0263..41ce1530d5 100644
--- a/templates/web/login/providers/bind.html.twig
+++ b/templates/web/login/providers/bind.html.twig
@@ -1,6 +1,6 @@
 {% extends "login/layout/sidebar-layout.html.twig" %}
 
-{% import "common/macros.html.twig" as macro %}
+{% import "common/macro_captcha.html.twig" as macro_captcha %}
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
@@ -60,7 +60,7 @@
                     {% if recaptcha_display %}
                         <div class="row-fluid">
                             <div class="span12">
-                                {{ macro.captcha() }}
+                                {{ macro_captcha.captcha() }}
                             </div>
                         </div>
                     {% endif %}
diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig
index 1016fa21e7..2a73222f4f 100644
--- a/templates/web/login/providers/mapping.html.twig
+++ b/templates/web/login/providers/mapping.html.twig
@@ -1,6 +1,6 @@
 {% extends "login/layout/sidebar-layout.html.twig" %}
 
-{% import "common/macros.html.twig" as macro %}
+{% import "common/macro_captcha.html.twig" as macro_captcha %}
 {% import "login/common/macros.html.twig" as auth_macro %}
 
 {% block title %}
@@ -76,7 +76,7 @@
                     {% if recaptcha_display %}
                         <div class="row-fluid">
                             <div class="span12">
-                                {{ macro.captcha() }}
+                                {{ macro_captcha.captcha() }}
                             </div>
                         </div>
                     {% endif %}
diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig
index 9b31038a33..6d62cb45a8 100644
--- a/templates/web/login/register-classic.html.twig
+++ b/templates/web/login/register-classic.html.twig
@@ -1,7 +1,7 @@
 {% extends "login/layout/sidebar-layout.html.twig" %}
 
 {% import "login/common/macros.html.twig" as auth_macro %}
-{% import "common/macros.html.twig" as macro %}
+{% import "common/macro_captcha.html.twig" as macro_captcha %}
 
 {% block title %}
     {{ "Register" | trans }}
@@ -85,7 +85,7 @@
                     {% if recaptcha_display %}
                         <div class="row-fluid">
                             <div class="span12">
-                                {{ macro.captcha() }}
+                                {{ macro_captcha.captcha() }}
                             </div>
                         </div>
                     {% endif %}
diff --git a/templates/web/prod/preview/caption.html.twig b/templates/web/prod/preview/caption.html.twig
index 4f4b08063a..4758f02211 100644
--- a/templates/web/prod/preview/caption.html.twig
+++ b/templates/web/prod/preview/caption.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
   {% set can_edit = granted_on_collection(record.baseId, [constant('\\ACL::CANMODIFRECORD')]) %}
   {% set can_see_business = can_edit %}
@@ -17,8 +17,4 @@
     {% endfor %}
 </div>
 
-{% if record.is_from_reg()  %}
-    {{macro.caption(record, can_see_business)}}
-{% else %}
-    {{macro.caption(record, can_see_business)}}
-{% endif %}
\ No newline at end of file
+{{macro_caption.caption(record, can_see_business)}}
diff --git a/templates/web/prod/results/list.html.twig b/templates/web/prod/results/list.html.twig
index 790a4c2414..ca45b67914 100644
--- a/templates/web/prod/results/list.html.twig
+++ b/templates/web/prod/results/list.html.twig
@@ -1,4 +1,4 @@
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 {% block content_item %}
     <div class='list ui-corner-all'>
@@ -14,7 +14,7 @@
                     <div class='desc' style='max-height:{{ settings.images_size + 70 }}px;overflow-y:auto;'>
                         <div class="fixeddesc">
                             {% set can_see_business = granted_on_collection(record.baseId, [constant('\\ACL::CANMODIFRECORD')]) %}
-                            {{ macro.caption(record, can_see_business) }}
+                            {{ macro_caption.caption(record, can_see_business) }}
                         </div>
                     </div>
                 </td>
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig
index 2d537dd72c..3707633998 100644
--- a/templates/web/prod/results/record.html.twig
+++ b/templates/web/prod/results/record.html.twig
@@ -1,5 +1,5 @@
 {% import 'prod/results/macro.html.twig' as result_macro %}
-{% import 'common/macros.html.twig' as macro %}
+{% import 'common/macro_caption.html.twig' as macro_caption %}
 
 <div style="width:{{ settings.images_size + 30}}px;"
      sbas="{{ record.databoxId }}"
@@ -25,7 +25,7 @@
         {% set can_see_business = granted_on_collection(record.baseId, [constant('\\ACL::CANMODIFRECORD')]) %}
 
         <div class="thumb captionTips"
-             {% if settings.rollover_thumbnail == 'caption' %}title="{{ macro.caption(record, can_see_business, false) | e }}"{% endif %}
+             {% if settings.rollover_thumbnail == 'caption' %}title="{{ macro_caption.caption(record, can_see_business, false) | e }}"{% endif %}
              {% if settings.rollover_thumbnail == 'preview' %}tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}"{% endif %}
              style="height:{{ settings.images_size }}px; z-index:90;">
             <div class="doc_infos">