diff --git a/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php b/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php
index e66c603121..8240331183 100644
--- a/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php
+++ b/lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php
@@ -105,6 +105,7 @@ class Twig extends ServiceAbstract
         $this->twig->addExtension(new \Twig_Extensions_Extension_Intl());
         // add filters truncate, wordwrap, nl2br
         $this->twig->addExtension(new \Twig_Extensions_Extension_Text());
+        $this->twig->addExtension(new \Alchemy\Phrasea\Twig\JSUniqueID());
     }
 
     private function loadTests()
@@ -119,36 +120,23 @@ class Twig extends ServiceAbstract
     private function loadFilters()
     {
         $this->twig->addFilter('serialize', new \Twig_Filter_Function('serialize'));
-        $this->twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));
-        $this->twig->addFilter('sbas_name', new \Twig_Filter_Function('phrasea::sbas_names'));
-        $this->twig->addFilter('unite', new \Twig_Filter_Function('p4string::format_octets'));
         $this->twig->addFilter('stristr', new \Twig_Filter_Function('stristr'));
         $this->twig->addFilter('implode', new \Twig_Filter_Function('implode'));
         $this->twig->addFilter('get_class', new \Twig_Filter_Function('get_class'));
         $this->twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes'));
-        $this->twig->addFilter('phraseadate', new \Twig_Filter_Function('phraseadate::getPrettyString'));
-        $this->twig->addFilter('format_octets', new \Twig_Filter_Function('p4string::format_octets'));
         $this->twig->addFilter('geoname_display', new \Twig_Filter_Function('geonames::name_from_id'));
         $this->twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo'));
-        $this->twig->addFilter('nl2br', new \Twig_Filter_Function('nl2br'));
         $this->twig->addFilter('floor', new \Twig_Filter_Function('floor'));
-        $this->twig->addFilter('bas_name', new \Twig_Filter_Function('phrasea::bas_names'));
         $this->twig->addFilter('bas_names', new \Twig_Filter_Function('phrasea::bas_names'));
-        $this->twig->addFilter('basnames', new \Twig_Filter_Function('phrasea::bas_names'));
+        $this->twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));
         $this->twig->addFilter('urlencode', new \Twig_Filter_Function('urlencode'));
         $this->twig->addFilter('sbasFromBas', new \Twig_Filter_Function('phrasea::sbasFromBas'));
-        $this->twig->addFilter('str_replace', new \Twig_Filter_Function('str_replace'));
-        $this->twig->addFilter('strval', new \Twig_Filter_Function('strval'));
         $this->twig->addFilter('key_exists', new \Twig_Filter_Function('array_key_exists'));
         $this->twig->addFilter('array_keys', new \Twig_Filter_Function('array_keys'));
         $this->twig->addFilter('round', new \Twig_Filter_Function('round'));
-        $this->twig->addFilter('dump', new \Twig_Filter_Function('var_dump'));
-        $this->twig->addFilter('formatdate', new \Twig_Filter_Function('phraseadate::getDate'));
-        $this->twig->addFilter('getPrettyDate', new \Twig_Filter_Function('phraseadate::getPrettyString'));
+        $this->twig->addFilter('formatDate', new \Twig_Filter_Function('phraseadate::getDate'));
         $this->twig->addFilter('prettyDate', new \Twig_Filter_Function('phraseadate::getPrettyString'));
-        $this->twig->addFilter('prettyString', new \Twig_Filter_Function('phraseadate::getPrettyString'));
-        $this->twig->addFilter('formatoctet', new \Twig_Filter_Function('p4string::format_octets'));
-        $this->twig->addFilter('getDate', new \Twig_Filter_Function('phraseadate::getDate'));
+        $this->twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets'));
         $this->twig->addFilter('geoname_name_from_id', new \Twig_Filter_Function('geonames::name_from_id'));
     }
 
diff --git a/lib/Alchemy/Phrasea/Twig/JSUniqueID.php b/lib/Alchemy/Phrasea/Twig/JSUniqueID.php
new file mode 100644
index 0000000000..c3bd107d85
--- /dev/null
+++ b/lib/Alchemy/Phrasea/Twig/JSUniqueID.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Alchemy\Phrasea\Twig;
+
+class JSUniqueID extends \Twig_Extension
+{
+
+    /**
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'alchemy_phrasea_jsuniqueid';
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function getFilters()
+    {
+        return array(
+            'JSUniqueID' => new \Twig_Filter_Method($this, 'JSUniqueID'),
+        );
+    }
+
+    public function JSUniqueID($prefix = null, $suffix = null)
+    {
+        return $prefix . 'id' . str_replace(array(',', '.'), '-', microtime(true)) . base_convert(mt_rand(0x19A100, 0x39AA3FF), 10, 36) . $suffix;
+    }
+}
\ No newline at end of file
diff --git a/lib/classes/module/console/systemTemplateGenerator.class.php b/lib/classes/module/console/systemTemplateGenerator.class.php
index ef28bda2b2..561f930dd6 100644
--- a/lib/classes/module/console/systemTemplateGenerator.class.php
+++ b/lib/classes/module/console/systemTemplateGenerator.class.php
@@ -56,41 +56,27 @@ class module_console_systemTemplateGenerator extends Command
                 ));
 
             $twig->addExtension(new Twig_Extensions_Extension_I18n());
+            $twig->addExtension(new \Alchemy\Phrasea\Twig\JSUniqueID());
 
-            /**
-             * @todo clean all duplicate filters
-             */
-            $twig->addFilter('serialize', new Twig_Filter_Function('serialize'));
-            $twig->addFilter('sbas_names', new Twig_Filter_Function('phrasea::sbas_names'));
-            $twig->addFilter('sbas_name', new Twig_Filter_Function('phrasea::sbas_names'));
-            $twig->addFilter('unite', new Twig_Filter_Function('p4string::format_octets'));
-            $twig->addFilter('stristr', new Twig_Filter_Function('stristr'));
-            $twig->addFilter('implode', new Twig_Filter_Function('implode'));
-            $twig->addFilter('stripdoublequotes', new Twig_Filter_Function('stripdoublequotes'));
-            $twig->addFilter('phraseadate', new Twig_Filter_Function('phraseadate::getPrettyString'));
-            $twig->addFilter('format_octets', new Twig_Filter_Function('p4string::format_octets'));
-            $twig->addFilter('geoname_display', new Twig_Filter_Function('geonames::name_from_id'));
-            $twig->addFilter('get_collection_logo', new Twig_Filter_Function('collection::getLogo'));
-            $twig->addFilter('nl2br', new Twig_Filter_Function('nl2br'));
-            $twig->addFilter('floor', new Twig_Filter_Function('floor'));
-            $twig->addFilter('bas_name', new Twig_Filter_Function('phrasea::bas_names'));
-            $twig->addFilter('bas_names', new Twig_Filter_Function('phrasea::bas_names'));
-            $twig->addFilter('basnames', new Twig_Filter_Function('phrasea::bas_names'));
-            $twig->addFilter('urlencode', new Twig_Filter_Function('urlencode'));
-            $twig->addFilter('sbasFromBas', new Twig_Filter_Function('phrasea::sbasFromBas'));
-            $twig->addFilter('str_replace', new Twig_Filter_Function('str_replace'));
-            $twig->addFilter('strval', new Twig_Filter_Function('strval'));
-            $twig->addFilter('key_exists', new Twig_Filter_Function('array_key_exists'));
-            $twig->addFilter('array_keys', new Twig_Filter_Function('array_keys'));
-            $twig->addFilter('round', new Twig_Filter_Function('round'));
-            $twig->addFilter('get_class', new Twig_Filter_Function('get_class'));
-            $twig->addFilter('formatdate', new Twig_Filter_Function('phraseadate::getDate'));
-            $twig->addFilter('getPrettyDate', new Twig_Filter_Function('phraseadate::getPrettyString'));
-            $twig->addFilter('prettyDate', new Twig_Filter_Function('phraseadate::getPrettyString'));
-            $twig->addFilter('prettyString', new Twig_Filter_Function('phraseadate::getPrettyString'));
-            $twig->addFilter('formatoctet', new Twig_Filter_Function('p4string::format_octet'));
-            $twig->addFilter('getDate', new Twig_Filter_Function('phraseadate::getDate'));
-            $twig->addFilter('geoname_name_from_id', new Twig_Filter_Function('geonames::name_from_id'));
+            $twig->addFilter('serialize', new \Twig_Filter_Function('serialize'));
+            $twig->addFilter('stristr', new \Twig_Filter_Function('stristr'));
+            $twig->addFilter('implode', new \Twig_Filter_Function('implode'));
+            $twig->addFilter('get_class', new \Twig_Filter_Function('get_class'));
+            $twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes'));
+            $twig->addFilter('geoname_display', new \Twig_Filter_Function('geonames::name_from_id'));
+            $twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo'));
+            $twig->addFilter('floor', new \Twig_Filter_Function('floor'));
+            $twig->addFilter('bas_names', new \Twig_Filter_Function('phrasea::bas_names'));
+            $twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));
+            $twig->addFilter('urlencode', new \Twig_Filter_Function('urlencode'));
+            $twig->addFilter('sbasFromBas', new \Twig_Filter_Function('phrasea::sbasFromBas'));
+            $twig->addFilter('key_exists', new \Twig_Filter_Function('array_key_exists'));
+            $twig->addFilter('array_keys', new \Twig_Filter_Function('array_keys'));
+            $twig->addFilter('round', new \Twig_Filter_Function('round'));
+            $twig->addFilter('formatDate', new \Twig_Filter_Function('phraseadate::getDate'));
+            $twig->addFilter('prettyDate', new \Twig_Filter_Function('phraseadate::getPrettyString'));
+            $twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets'));
+            $twig->addFilter('geoname_name_from_id', new \Twig_Filter_Function('geonames::name_from_id'));
 
             $finder = new Symfony\Component\Finder\Finder();
             foreach ($finder->files()->in(array($tplDir))->exclude('Mustache') as $file) {
diff --git a/templates/mobile/report/table_content.twig b/templates/mobile/report/table_content.twig
index afb85c90b9..d7193fc967 100644
--- a/templates/mobile/report/table_content.twig
+++ b/templates/mobile/report/table_content.twig
@@ -197,7 +197,7 @@
                 {% for key, value in dashboard_array.dashboard.top_ten_user.poiddoc %}
                     <tr>
                         <td>{{ value.user|e }}</td>
-                        <td>{{ value.poiddoc|unite }}</td>
+                        <td>{{ value.poiddoc | formatOctets }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>
@@ -228,7 +228,7 @@
                 {% for key, value in dashboard_array.dashboard.top_ten_user.poidprev %}
                     <tr>
                         <td>{{ value.user|e }}</td>
-                        <td>{{ value.poidprev|unite }}</td>
+                        <td>{{ value.poidprev | formatOctets }}</td>
                     </tr>
                 {% endfor %}
                 </tbody>
diff --git a/templates/web/admin/editusers.twig b/templates/web/admin/editusers.twig
index f9a16faabb..f501d5159a 100644
--- a/templates/web/admin/editusers.twig
+++ b/templates/web/admin/editusers.twig
@@ -203,7 +203,7 @@
 
               <tr>
                 <td style="width:122px;overflow:hidden;white-space:nowrap;">
-                  {{rights['sbas_id']|sbas_name}}
+                  {{rights['sbas_id']|sbas_names}}
                 </td>
                 <td class="users_col options">
                   <div>
@@ -353,7 +353,7 @@
               {% endif %}
               <tr>
                 <td style="overflow:hidden;white-space:nowrap;">
-                  {{rights['base_id']|bas_name}}
+                  {{rights['base_id']|bas_names}}
                 </td>
                 <td class="users_col case_right_access" title="{% trans 'Access' %}">
                   {{_self.format_checkbox(user, rights, 'access', users, 'base')}}
diff --git a/templates/web/admin/editusers_masks.twig b/templates/web/admin/editusers_masks.twig
index 284dd014ff..e1c537006c 100644
--- a/templates/web/admin/editusers_masks.twig
+++ b/templates/web/admin/editusers_masks.twig
@@ -1,9 +1,9 @@
 <h1>Masks</h1>
 <div>
-Base {{base_id|sbasFromBas|sbas_name}}
+Base {{base_id|sbasFromBas|sbas_names}}
 </div>
 <div>
-Collection {{base_id|bas_name}}
+Collection {{base_id|bas_names}}
 </div>
 <form>
     <table style="table-layout:fixed; width:280px;position:relative;left:10px;" width="280px">
diff --git a/templates/web/admin/editusers_quotas.twig b/templates/web/admin/editusers_quotas.twig
index 63799a869c..01b3b280c6 100644
--- a/templates/web/admin/editusers_quotas.twig
+++ b/templates/web/admin/editusers_quotas.twig
@@ -38,11 +38,11 @@
 
 <h1>{% trans 'Quotas' %}</h1>
 <div>
-{% set base = base_id|sbasFromBas|sbas_name %}
+{% set base = base_id|sbasFromBas|sbas_names %}
 {% trans %}Base {{base}}{% endtrans %}
 </div>
 <div>
-{% set collection = base_id|bas_name %}
+{% set collection = base_id|bas_names %}
 {% trans %}Collection {{collection}}{% endtrans %}
 </div>
 <form>
diff --git a/templates/web/admin/editusers_timelimit.twig b/templates/web/admin/editusers_timelimit.twig
index 8a9ce7f0f1..452a32c975 100644
--- a/templates/web/admin/editusers_timelimit.twig
+++ b/templates/web/admin/editusers_timelimit.twig
@@ -1,10 +1,10 @@
 <h1>{% trans 'Limite temporelle' %}</h1>
 <div>
-{% set base = base_id|sbasFromBas|sbas_name %}
+{% set base = base_id|sbasFromBas|sbas_names %}
 {% trans %}Base {{base}}{% endtrans %}
 </div>
 <div>
-{% set collection = base_id|bas_name %}
+{% set collection = base_id|bas_names %}
 {% trans %}Collection {{collection}}{% endtrans %}
 </div>
 <form>
diff --git a/templates/web/admin/publications/list.html b/templates/web/admin/publications/list.html
index 6b690c1290..efbd0decaf 100644
--- a/templates/web/admin/publications/list.html
+++ b/templates/web/admin/publications/list.html
@@ -63,7 +63,7 @@
           </div>
         </td>
         <td><a href="/admin/publications/feed/{{ feed.get_id() }}/">{{ feed.get_title() }}</a></td>
-        <td>{{ feed.get_created_on()|formatdate }}</td>
+        <td>{{ feed.get_created_on()| formatDate }}</td>
         <td>
           {% if feed.get_collection() != null %}
             {{ feed.get_collection().get_databox().get_viewname() }} /
diff --git a/templates/web/admin/users.html b/templates/web/admin/users.html
index ae78a3eb11..a79079523f 100644
--- a/templates/web/admin/users.html
+++ b/templates/web/admin/users.html
@@ -184,7 +184,7 @@
           {{usr.get_applied_template()}}
         </td>
         <td>
-          {{usr.get_creation_date()|getDate}}
+          {{usr.get_creation_date() | formatDate}}
         </td>
       </tr>
       {% endfor %}
diff --git a/templates/web/common/HTML5Video.html.twig b/templates/web/common/HTML5Video.html.twig
index fd7a909863..29dfaf492d 100644
--- a/templates/web/common/HTML5Video.html.twig
+++ b/templates/web/common/HTML5Video.html.twig
@@ -7,9 +7,11 @@
         <div style="width:{{ displayWidth | round }}px;height:{{ displayHeight | round }}px;" class="thumb_wrapper {{ extraclass | default('') }}">
     {% endif %}
 
+    {% set unique_id = '' | JSUniqueID %}
+
     <div class="record record_video imgTips" style="position:relative;width:{{ displayWidth | round }}px;height:{{ displayHeight | round }}px;">
-        <video id="video_preview_tooltip" class="videoTips video-js vjs-default-skin" controls autoplay
-        preload="auto" xposter="my_video_poster.png" width="{{ displayWidth|round }}" height="{{ displayHeight | round }}"
+        <video id="{{ unique_id }}" class="videoTips video-js vjs-default-skin" controls autoplay
+        preload="auto" width="{{ displayWidth|round }}" height="{{ displayHeight | round }}"
         data-setup="{}">
         {% for name, subdef in arraySubdefs %}
             {% if loop.first %}
@@ -29,12 +31,17 @@
     <script type="text/javascript">
         $(document).ready(function(){
             try {
-                _V_("video_preview_tooltip", {}, function(){
+                _V_("{{ unique_id }}", {}, function(){
                     var player = this;
-                    $('#video_preview_tooltip').parent().bind('resize-video-js', function(){
+
+                    $('#{{ unique_id }}').parent().bind('resize-video-js', function(){
                         player.width($(this).width());
                         player.height($(this).height());
                     });
+
+                    $('#{{ unique_id }}').bind('unload-video-js', function(){
+                        player.destroy();
+                    });
                 });
             } catch(err) {
                 console.error('An error has been catched during the execution of VideoJS', err);
diff --git a/templates/web/common/dialog_export.twig b/templates/web/common/dialog_export.twig
index 27e8de089e..b8ac0a0b45 100644
--- a/templates/web/common/dialog_export.twig
+++ b/templates/web/common/dialog_export.twig
@@ -111,7 +111,7 @@
                                         <input class="{{values.class}}" type="checkbox" id="download_{{name}}" name="obj[]" value="{{name}}" />
                                         <input type="hidden" name="download_{{name}}" value="{{values.size}}" />
                                         <input type="hidden" name="count_{{name}}" value="{{values.available}}" />
-                                        {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size|format_octets}})
+                                        {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size | formatOctets}})
                                     </label>
                                     {% set title%}
                                         {% trans 'Documents indisponibles' %}
@@ -178,7 +178,7 @@
                                     <div style="margin: 10px 0 20px 0; padding: 0 10px;">
                                         <label for="sendmail_{{name}}" class="checkbox">
                                             <input class="{{values.class}}" type="checkbox" id="sendmail_{{name}}" name="obj[]" value="{{name}}" />
-                                            {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size|format_octets}})
+                                            {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size | formatOctets}})
                                         </label>
                                         {% set title%}
                                             {% trans 'Documents indisponibles' %}
@@ -399,7 +399,7 @@
                                     <div style="margin: 10px 0 20px 0; padding: 0 10px;">
                                         <label for="ftp_{{name}}" class="checkbox">
                                             <input class="{{values.class}}" type="checkbox" id="ftp_{{name}}" name="obj[]" value="{{name}}" />
-                                            {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size|format_octets}}))
+                                            {{values.label}} {% if values.total != values.available %}{{values.available}}/{{values.total}}{% endif %} ({{values.size | formatOctets}}))
                                         </label>
                                         {% set title%}
                                             {% trans 'Documents indisponibles' %}
diff --git a/templates/web/common/technical_datas.twig b/templates/web/common/technical_datas.twig
index 482bbc4492..a321d9d686 100644
--- a/templates/web/common/technical_datas.twig
+++ b/templates/web/common/technical_datas.twig
@@ -11,7 +11,7 @@
     {{ record.get_mime() }}
 
     {% if document and document.get_size() %}
-        - {{document.get_size()|formatoctet}}
+        - {{document.get_size()| formatOctets}}
     {% endif %}
     <br/>
 
diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig
index 707b9756bb..cdf3405a90 100644
--- a/templates/web/prod/Tooltip/Basket.html.twig
+++ b/templates/web/prod/Tooltip/Basket.html.twig
@@ -13,7 +13,7 @@
     </div>
     <div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
         {% set nb_records = basket.getElements()|length %}
-        {% set date = basket.getUpdated()|prettyString %}
+        {% set date = basket.getUpdated() | prettyDate %}
         {% trans %}
         {{ nb_records }} records
         {% endtrans %}
diff --git a/templates/web/prod/Tooltip/Story.html.twig b/templates/web/prod/Tooltip/Story.html.twig
index 2fbfac6871..be3328070f 100644
--- a/templates/web/prod/Tooltip/Story.html.twig
+++ b/templates/web/prod/Tooltip/Story.html.twig
@@ -10,7 +10,7 @@
     <div class="noToolTipResize" style="margin:5px;width:{{ width - 40 }}px;height:300px;position:relative;">
     <div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
         {% set nb_records = Story.get_children().get_elements()|length %}
-        {% set date = Story.get_modification_date()|prettyString %}
+        {% set date = Story.get_modification_date() | prettyDate %}
         {% trans %}
         {{ nb_records }} records
         {% endtrans %}
diff --git a/templates/web/prod/actions/Feedback/ListsMacros.html.twig b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
index 3b7bb3fe20..ba4bbedb7a 100644
--- a/templates/web/prod/actions/Feedback/ListsMacros.html.twig
+++ b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
@@ -78,7 +78,7 @@
               {{ user.get_login() }}
             </td>
             <td>
-              {{ user.get_creation_date()|getDate }}
+              {{ user.get_creation_date() | formatDate }}
             </td>
           </tr>
           {% endfor %}
diff --git a/templates/web/prod/feeds/entry_macro.html b/templates/web/prod/feeds/entry_macro.html
index 167a120188..586878ecb7 100644
--- a/templates/web/prod/feeds/entry_macro.html
+++ b/templates/web/prod/feeds/entry_macro.html
@@ -27,8 +27,8 @@
       </tr>
     </table>
     <div class="post_date">
-      {% set updated_on = entry.get_updated_on()|getPrettyDate %}
-      {% set created_on = entry.get_created_on()|getPrettyDate %}
+      {% set updated_on = entry.get_updated_on() | prettyDate %}
+      {% set created_on = entry.get_created_on() | prettyDate %}
       <span class="created_on">
           {{ created_on }}
       </span>
@@ -60,5 +60,5 @@
     {% endfor %}
     </div>
   </div>
-  
+
 {% endmacro %}
\ No newline at end of file
diff --git a/templates/web/prod/orders/order_box.twig b/templates/web/prod/orders/order_box.twig
index 1b934d5e09..f76e0efe25 100644
--- a/templates/web/prod/orders/order_box.twig
+++ b/templates/web/prod/orders/order_box.twig
@@ -26,10 +26,10 @@
         </thead>
         <tbody>
     {% for order in ordermanager %}
-        {% set deadline = order.get_deadline()|phraseadate%}
+        {% set deadline = order.get_deadline() | prettyDate %}
         <tr id="order_{{order.get_order_id()}}" class="order_row">
             <td>{{order.get_user().get_display_name()}}</td>
-            <td>{{order.get_created_on()|phraseadate}}</td>
+            <td>{{order.get_created_on() | prettyDate }}</td>
             <td>
                 {% if deadline != '' %}
                     {{deadline}}
diff --git a/templates/web/prod/orders/order_item.twig b/templates/web/prod/orders/order_item.twig
index aa527cd95f..b9add58859 100644
--- a/templates/web/prod/orders/order_item.twig
+++ b/templates/web/prod/orders/order_item.twig
@@ -12,11 +12,11 @@
             </tr>
             <tr>
                 <td>{% trans 'Date de commande' %}</td>
-                <td>{{ order.get_created_on()|phraseadate }}</td>
+                <td>{{ order.get_created_on() | prettyDate }}</td>
             </tr>
             <tr>
                 <td>{% trans 'Deadline' %}</td>
-                <td>{{ order.get_deadline()|phraseadate }}</td>
+                <td>{{ order.get_deadline() | prettyDate }}</td>
             </tr>
             <tr>
                 <td>{% trans 'Utilisation prevue' %}</td>
diff --git a/templates/web/prod/preview/short_history.html b/templates/web/prod/preview/short_history.html
index 252182112b..424929b30d 100644
--- a/templates/web/prod/preview/short_history.html
+++ b/templates/web/prod/preview/short_history.html
@@ -23,7 +23,7 @@
           {% trans 'report::Edition des meta-donnees' %}
         {% elseif action == 'collection' %}
           {% set dest = done['final']|implode(', ') %}
-          {% set coll_name = dest|bas_name %}
+          {% set coll_name = dest|bas_names %}
           {% trans %}report::Changement de collection vers : {{coll_name}}{% endtrans %}
         {% elseif action == 'status' %}
           {% trans 'report::Edition des status' %}
diff --git a/templates/web/report/dashboard_macro.twig b/templates/web/report/dashboard_macro.twig
index 60a571b34e..619fe128fd 100644
--- a/templates/web/report/dashboard_macro.twig
+++ b/templates/web/report/dashboard_macro.twig
@@ -21,7 +21,7 @@
                             <td><a href="#" id= "id_{{ value.id }}" >{{ value.lib|e }}</a></td>
                         {% endif %}
                     {% endif %}
-                    <td>{{ unite == "true" ? value.nb|unite : value.nb }}</td>
+                    <td>{{ unite == "true" ? value.nb | formatOctets : value.nb }}</td>
                 </tr>
             {% endfor %}
             </tbody>
diff --git a/www/include/jquery.p4.preview.js b/www/include/jquery.p4.preview.js
index db34cd2f16..b43d1a64aa 100644
--- a/www/include/jquery.p4.preview.js
+++ b/www/include/jquery.p4.preview.js
@@ -529,7 +529,5 @@ function closePreview(){
 		$(this).dequeue();
 	});
 
-        $.each($('#PREVIEWBOX video'), function(i,el){
-            _V_($(el).attr('id')).destroy();
-        });
+        $('#PREVIEWBOX .videoTips.video-js').trigger('unload-video-js');
 }
diff --git a/www/include/jquery.tooltip.js b/www/include/jquery.tooltip.js
index 323d0e5b65..4a62a637d9 100644
--- a/www/include/jquery.tooltip.js
+++ b/www/include/jquery.tooltip.js
@@ -248,7 +248,7 @@
         ratio = width/height;
         $imgTips.css({top:'0px',left:'0px'});
       }
-      
+
       if ($videoTips[0] && $('#' + settings($.tooltip.current).id + ' .noToolTipResize').length === 0) {
         resizeVideoTips = true;
         width = parseInt($videoTips.attr('width'));
@@ -446,7 +446,7 @@
             maxHeight: Math.round(height-70)
           });
         }
-        
+
         if(resizeVideoTips)
         {
           $videoTips.css({
@@ -594,15 +594,8 @@
     {
       $.tooltip.ajaxRequest.abort();
     }
-    
-    $.each($('#tooltip video'), function(i,el){
-        try {
-            _V_($(el).attr('id')).destroy();
-        } catch(err) {
-            console.error('An error has been catched during the execution of VideoJS', err);
-        }
-    });
-  
+    $('#tooltip .videoTips.video-js').trigger('unload-video-js');
+
     helper.body.empty();
     $.tooltip.current = null;
     function complete() {
@@ -628,13 +621,7 @@ function unfix_tooltip()
   $.tooltip.visible = false;
   $.tooltip.current = null;
   $('#tooltip').hide();
-  $.each($('#tooltip video'), function(i,el){
-      try {
-       _V_($(el).attr('id')).destroy();
-      } catch(err) {
-          console.error('An error has been catched during the execution of VideoJS', err);
-      }
-  });
+  $('#tooltip .videoTips.video-js').trigger('unload-video-js');
   $('#tooltip .tooltip_closer').hide();
   hideOverlay('_tooltip');
 }