2 files changed, 7 insertions, 5 deletions
diff --git a/server/sonar-web/src/main/js/coding-rules/app.js b/server/sonar-web/src/main/js/coding-rules/app.js
index b467dbaadb7..b92d703e1a4 100644
--- a/server/sonar-web/src/main/js/coding-rules/app.js
+++ b/server/sonar-web/src/main/js/coding-rules/app.js
@@ -115,7 +115,9 @@ requirejs([
         App.repositories = r.repositories;
         App.repositories.push(App.manualRepository());
         App.statuses = r.statuses;
-        App.characteristics = r.characteristics;
+        App.characteristics = r.characteristics.map(function (item, index) {
+          return _.extend(item, { index: index });
+        });
       });
 
       $.when(window.requestMessages(), appXHR).done(function () {
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/characteristic-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/characteristic-facet.js
index 359131f5f04..0845bd744cc 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/characteristic-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/characteristic-facet.js
@@ -1,8 +1,10 @@
 define([
-  'coding-rules/facets/base-facet'
+  'coding-rules/facets/base-facet',
+  'templates/coding-rules'
 ], function (BaseFacet) {
 
   return BaseFacet.extend({
+    template: Templates['coding-rules-characteristic-facet'],
 
     getValues: function () {
       var values = this.model.getValues(),
@@ -19,9 +21,7 @@ define([
     },
 
     sortValues: function (values) {
-      return _.sortBy(values, function (v) {
-        return v.val === 'NONE' ? -999999 : -v.count;
-      });
+      return _.sortBy(values, 'index');
     },
 
     serializeData: function () {