diff --git a/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.js b/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.js
index 35576931e2..714a952dbd 100644
--- a/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.js
+++ b/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.js
@@ -103,17 +103,26 @@ describe('connectCurrentRefinements', () => {
         createURL: () => '#',
       });
 
-      expect(rendering.mock.calls[0][0].items).toEqual([
-        expect.objectContaining({
-          attribute: 'facet1',
-        }),
-        expect.objectContaining({
-          attribute: 'facet2',
-        }),
-        expect.objectContaining({
-          attribute: 'facet3',
-        }),
-      ]);
+      expect(rendering.mock.calls[0][0].items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            attribute: 'facet1',
+          }),
+          expect.objectContaining({
+            attribute: 'facet2',
+          }),
+          expect.objectContaining({
+            attribute: 'facet3',
+          }),
+        ])
+      );
+      expect(rendering.mock.calls[0][0].items).toEqual(
+        expect.not.arrayContaining([
+          expect.objectContaining({
+            attribute: 'query',
+          }),
+        ])
+      );
     });
 
     it('includes only the `includedAttributes`', () => {
@@ -259,20 +268,22 @@ describe('connectCurrentRefinements', () => {
         createURL: () => '#',
       });
 
-      expect(rendering.mock.calls[0][0].items).toEqual([
-        expect.objectContaining({
-          attribute: 'facet1',
-          transformed: true,
-        }),
-        expect.objectContaining({
-          attribute: 'facet2',
-          transformed: true,
-        }),
-        expect.objectContaining({
-          attribute: 'facet3',
-          transformed: true,
-        }),
-      ]);
+      expect(rendering.mock.calls[0][0].items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            attribute: 'facet1',
+            transformed: true,
+          }),
+          expect.objectContaining({
+            attribute: 'facet2',
+            transformed: true,
+          }),
+          expect.objectContaining({
+            attribute: 'facet3',
+            transformed: true,
+          }),
+        ])
+      );
 
       widget.render({
         results: new SearchResults(helper.state, [{}]),
@@ -281,20 +292,22 @@ describe('connectCurrentRefinements', () => {
         createURL: () => '#',
       });
 
-      expect(rendering.mock.calls[0][0].items).toEqual([
-        expect.objectContaining({
-          attribute: 'facet1',
-          transformed: true,
-        }),
-        expect.objectContaining({
-          attribute: 'facet2',
-          transformed: true,
-        }),
-        expect.objectContaining({
-          attribute: 'facet3',
-          transformed: true,
-        }),
-      ]);
+      expect(rendering.mock.calls[0][0].items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            attribute: 'facet1',
+            transformed: true,
+          }),
+          expect.objectContaining({
+            attribute: 'facet2',
+            transformed: true,
+          }),
+          expect.objectContaining({
+            attribute: 'facet3',
+            transformed: true,
+          }),
+        ])
+      );
     });
 
     it('sort numeric refinements by numeric value', () => {
@@ -442,7 +455,7 @@ describe('connectCurrentRefinements', () => {
 
       helper
         .addFacetRefinement('facet1', 'facetValue')
-        .addFacetRefinement('facet2', 'facetValue2');
+        .addFacetRefinement('facet2', 'facetValue');
 
       widget.render({
         results: new SearchResults(helper.state, [{}]),
@@ -452,14 +465,16 @@ describe('connectCurrentRefinements', () => {
       });
 
       const secondRenderingOptions = rendering.mock.calls[1][0];
-      expect(secondRenderingOptions.items).toEqual([
-        expect.objectContaining({
-          attribute: 'facet1',
-        }),
-        expect.objectContaining({
-          attribute: 'facet2',
-        }),
-      ]);
+      expect(secondRenderingOptions.items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            attribute: 'facet1',
+          }),
+          expect.objectContaining({
+            attribute: 'facet2',
+          }),
+        ])
+      );
     });
   });
 });
diff --git a/src/connectors/current-refinements/connectCurrentRefinements.js b/src/connectors/current-refinements/connectCurrentRefinements.js
index 9df8b909c1..ff26c4d283 100644
--- a/src/connectors/current-refinements/connectCurrentRefinements.js
+++ b/src/connectors/current-refinements/connectCurrentRefinements.js
@@ -276,33 +276,19 @@ function normalizeRefinement(refinement) {
   };
 }
 
-function compareObjects(a, b, attribute) {
-  if (a[attribute] === b[attribute]) {
-    return 0;
-  }
-
-  if (a[attribute] < b[attribute]) {
-    return -1;
-  }
-
-  return 1;
-}
-
 function groupItemsByRefinements(items, helper) {
   return items.reduce(
-    (results, currentItem) =>
-      [
-        {
-          attribute: currentItem.attribute,
-          refinements: items
-            .filter(result => result.attribute === currentItem.attribute)
-            .sort((a, b) =>
-              compareObjects(a, b, a.type === 'numeric' ? 'value' : 'label')
-            ),
-          refine: refinement => clearRefinement(helper, refinement),
-        },
-        ...results.filter(result => result.attribute !== currentItem.attribute),
-      ].sort((a, b) => compareObjects(a, b, 'attribute')),
+    (results, currentItem) => [
+      ...results.filter(result => result.attribute !== currentItem.attribute),
+      {
+        attribute: currentItem.attribute,
+        refinements: items
+          .filter(result => result.attribute === currentItem.attribute)
+          // We want to keep the order of refinements except the numeric ones.
+          .sort((a, b) => (a.type === 'numeric' ? a.value - b.value : 0)),
+        refine: refinement => clearRefinement(helper, refinement),
+      },
+    ],
     []
   );
 }
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 6f42e0af20..6c353a9109 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -247,17 +247,7 @@ function getRefinement(state, type, attributeName, name, resultsFacets) {
 }
 
 function getRefinements(results, state, clearsQuery) {
-  const res =
-    clearsQuery && state.query && state.query.trim()
-      ? [
-          {
-            attributeName: 'query',
-            type: 'query',
-            name: state.query,
-            query: state.query,
-          },
-        ]
-      : [];
+  const res = [];
 
   forEach(state.facetsRefinements, (refinements, attributeName) => {
     forEach(refinements, name => {
@@ -321,6 +311,15 @@ function getRefinements(results, state, clearsQuery) {
     res.push({ type: 'tag', attributeName: '_tags', name });
   });
 
+  if (clearsQuery && state.query && state.query.trim()) {
+    res.push({
+      attributeName: 'query',
+      type: 'query',
+      name: state.query,
+      query: state.query,
+    });
+  }
+
   return res;
 }
 
diff --git a/src/widgets/current-refinements/__tests__/__snapshots__/current-refinements-test.js.snap b/src/widgets/current-refinements/__tests__/__snapshots__/current-refinements-test.js.snap
index f5a575f69f..d7590ea673 100644
--- a/src/widgets/current-refinements/__tests__/__snapshots__/current-refinements-test.js.snap
+++ b/src/widgets/current-refinements/__tests__/__snapshots__/current-refinements-test.js.snap
@@ -15,46 +15,6 @@ exports[`currentRefinements() render() DOM output renders correctly 1`] = `
   }
   items={
     Array [
-      Object {
-        "attribute": "_tags",
-        "refine": [Function],
-        "refinements": Array [
-          Object {
-            "attribute": "_tags",
-            "label": "tag1",
-            "type": "tag",
-            "value": "tag1",
-          },
-          Object {
-            "attribute": "_tags",
-            "label": "tag2",
-            "type": "tag",
-            "value": "tag2",
-          },
-        ],
-      },
-      Object {
-        "attribute": "disjunctiveFacet",
-        "refine": [Function],
-        "refinements": Array [
-          Object {
-            "attribute": "disjunctiveFacet",
-            "count": 3,
-            "exhaustive": true,
-            "label": "disjunctiveFacet-val1",
-            "type": "disjunctive",
-            "value": "disjunctiveFacet-val1",
-          },
-          Object {
-            "attribute": "disjunctiveFacet",
-            "count": 4,
-            "exhaustive": true,
-            "label": "disjunctiveFacet-val2",
-            "type": "disjunctive",
-            "value": "disjunctiveFacet-val2",
-          },
-        ],
-      },
       Object {
         "attribute": "extraFacet",
         "refine": [Function],
@@ -109,6 +69,28 @@ exports[`currentRefinements() render() DOM output renders correctly 1`] = `
           },
         ],
       },
+      Object {
+        "attribute": "disjunctiveFacet",
+        "refine": [Function],
+        "refinements": Array [
+          Object {
+            "attribute": "disjunctiveFacet",
+            "count": 3,
+            "exhaustive": true,
+            "label": "disjunctiveFacet-val1",
+            "type": "disjunctive",
+            "value": "disjunctiveFacet-val1",
+          },
+          Object {
+            "attribute": "disjunctiveFacet",
+            "count": 4,
+            "exhaustive": true,
+            "label": "disjunctiveFacet-val2",
+            "type": "disjunctive",
+            "value": "disjunctiveFacet-val2",
+          },
+        ],
+      },
       Object {
         "attribute": "hierarchicalFacet",
         "refine": [Function],
@@ -123,6 +105,26 @@ exports[`currentRefinements() render() DOM output renders correctly 1`] = `
           },
         ],
       },
+      Object {
+        "attribute": "numericFacet",
+        "refine": [Function],
+        "refinements": Array [
+          Object {
+            "attribute": "numericFacet",
+            "label": "≥ 1",
+            "operator": ">=",
+            "type": "numeric",
+            "value": 1,
+          },
+          Object {
+            "attribute": "numericFacet",
+            "label": "≤ 2",
+            "operator": "<=",
+            "type": "numeric",
+            "value": 2,
+          },
+        ],
+      },
       Object {
         "attribute": "numericDisjunctiveFacet",
         "refine": [Function],
@@ -144,22 +146,20 @@ exports[`currentRefinements() render() DOM output renders correctly 1`] = `
         ],
       },
       Object {
-        "attribute": "numericFacet",
+        "attribute": "_tags",
         "refine": [Function],
         "refinements": Array [
           Object {
-            "attribute": "numericFacet",
-            "label": "≥ 1",
-            "operator": ">=",
-            "type": "numeric",
-            "value": 1,
+            "attribute": "_tags",
+            "label": "tag1",
+            "type": "tag",
+            "value": "tag1",
           },
           Object {
-            "attribute": "numericFacet",
-            "label": "≤ 2",
-            "operator": "<=",
-            "type": "numeric",
-            "value": 2,
+            "attribute": "_tags",
+            "label": "tag2",
+            "type": "tag",
+            "value": "tag2",
           },
         ],
       },