diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php
index 5f488cdd5a..3a3ff63afc 100644
--- a/lib/Alchemy/Phrasea/Core/Version.php
+++ b/lib/Alchemy/Phrasea/Core/Version.php
@@ -16,7 +16,7 @@ class Version
     /**
      * @var string
      */
-    private $number = '4.1.0-alpha.20a';
+    private $number = '4.1.0-alpha.21a';
 
     /**
      * @var string
diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php
index 4dbf6899bf..1f2fa3d1e2 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php
@@ -149,7 +149,7 @@ class ElasticsearchSettingsFormType extends AbstractType
 
         // populate aggs to form
         foreach($aggs as $k=>$agg) {
-            $builder->add('aggregates:' . $k . ':limit', ChoiceType::class, $agg);
+            $builder->add('facets:' . $k . ':limit', ChoiceType::class, $agg);
         }
 
     }
diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig
index 0dc661fc5c..016534fd52 100644
--- a/templates/web/admin/fields/templates.html.twig
+++ b/templates/web/admin/fields/templates.html.twig
@@ -238,14 +238,12 @@
                         <label for="aggregable">{% trans %}Aggregation{% endtrans %}</label>
                     </td>
                     <td>
-                        <select id="aggregable">
-                            <option <%= field['aggregable'] == "0" ? 'selected' : '' %> value='0'>{% trans %}Not aggregated{% endtrans %}</option>
-                            <option <%= field['aggregable'] == "10" ? 'selected' : '' %> value='10'>10 values</option>
-                            <option <%= field['aggregable'] == "20" ? 'selected' : '' %> value='20'>20 values</option>
-                            <option <%= field['aggregable'] == "50" ? 'selected' : '' %> value='50'>50 values</option>
-                            <option <%= field['aggregable'] == "100" ? 'selected' : '' %> value='100'>100 values</option>
-                            <option <%= field['aggregable'] == "-1" ? 'selected' : '' %> value='-1'>{% trans %}All values{% endtrans %}</option>
-                        </select>
+                        <%= field['aggregable'] == "0" ? '{% trans %}Not aggregated{% endtrans %}' : '' %>
+                        <%= field['aggregable'] == "10" ? '10 values' : '' %>
+                        <%= field['aggregable'] == "20" ? '20 values' : '' %>
+                        <%= field['aggregable'] == "50" ? '50 values' : '' %>
+                        <%= field['aggregable'] == "100" ? '100 values' : '' %>
+                        <%= field['aggregable'] == "-1" ? 'All values' : '' %>
                     </td>
                 </tr>
                 <tr>
diff --git a/templates/web/admin/search-engine/general-aggregation.html.twig b/templates/web/admin/search-engine/general-aggregation.html.twig
index d4b83ba31b..0c377d2ecd 100644
--- a/templates/web/admin/search-engine/general-aggregation.html.twig
+++ b/templates/web/admin/search-engine/general-aggregation.html.twig
@@ -1,12 +1,37 @@
 <div class="general-aggregation-layout">
+    <button type="submit" id="elasticsearch_settings_save_facets" name="elasticsearch_settings[save]"
+            class="btn btn-primary">{{ 'Save' | trans }}</button>
+    <div id="basket-filter" class="facet-filter unstyled" style="float: right; padding-top: 27px;">
+        {#<span class="filter-title">{{ 'See' | trans }} : </span>#}
+        <span class="filter-item">
+              <label id="aggregated-list" class="checkbox inline" for="basketFilter">
+                  <input type="checkbox" class="checkbox " value="aggregated" checked
+                         style="margin-top: 1px">
+                  {{ 'Aggregated' | trans }}
+              </label>
+          </span>
+        <span class="filter-item" style="margin-left: 10px">
+              <label id="not-aggregated-list" class="checkbox inline" for="basketFilter">
+                  <input type="checkbox" class="checkbox " value="not-aggregated" checked
+                         style="margin-top: 1px">
+                  {{ 'Not aggregated' | trans }}
+              </label>
+          </span>
+
+    </div>
     <ul class="unstyled aggregation-collection">
         {% for formdata in form %}
             {% set attr = formdata.vars['attr']|join(',') %}
+            {% set label = formdata.vars['label']|join(',') %}
             {% if attr == 'aggregate' %}
-                <li>
+                <li id="{{ label }}" class="field-row  {% if label starts with '#_' %}lightblue{% endif %}">
+
                     <table>
                         <tbody>
                         <tr>
+                            <td class="handle">
+                                <i class="fa fa-arrows" aria-hidden="true"></i>
+                            </td>
                             <td>
                                 {{ form_label(formdata, null, {
                                     'label_attr': {'class': 'label-aggregation'}
@@ -22,6 +47,39 @@
             {% endif %}
         {% endfor %}
     </ul>
-    <button type="submit" id="elasticsearch_settings_save" name="elasticsearch_settings[save]"
-            class="btn btn-primary">{{ 'Save' | trans }}</button>
-</div>
\ No newline at end of file
+    <input type="hidden" id="listValues" name="facet_list_values"/>
+</div>
+
+<script type="text/javascript">
+    /*Add a sort for the  list*/
+    function filterFacet() {
+        $.each($(".aggregate option:selected"), function () {
+            if ($(this).val() == 0) {
+                $(this).closest('.field-row').addClass('not-aggregated')
+            }
+            else {
+                $(this).closest('.field-row').addClass('aggregated')
+            }
+        });
+        $('#aggregated-list input').click(function () {
+            $('.aggregated').toggleClass('hidden');
+        });
+        $('#not-aggregated-list input').click(function () {
+            $('.not-aggregated').toggleClass('hidden');
+        });
+    }
+    /*Get the order of new list*/
+    var sortEventHandler = function (event, ui) {
+        $('#listValues').val(JSON.stringify($('form').serializeArray()));
+    };
+    $(document).ready(function () {
+        $('.lightblue .label-aggregation').css('color','mediumblue');
+        $('.aggregation-collection').sortable({
+            handle: ".handle",
+            stop: sortEventHandler
+        });
+        // sortEventHandler(null, null);   // enforce build list
+        filterFacet();
+        $("#elasticsearch_settings_save_facets").click(function(){sortEventHandler(null, null);});
+    });
+</script>
\ No newline at end of file