diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js b/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
index 2edcdccec8..63b8753f08 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
@@ -142,6 +142,7 @@
               "dateStamp",
               "documentStandard",
               "mdStatus*",
+              "cl_status*",
               "*inspire*"
             ]
           },
diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html
index b73e0cd136..8983685b76 100644
--- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html
+++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html
@@ -35,6 +35,7 @@
                 >
                 {{md.resourceTitle}}
               </a>
+              <div data-gn-status-badge="md" />
               <span data-ng-show="md.isTemplate == 's'">{{md.resourceTitle}}</span>
               <div class="gn-record-details text-muted">
                 <small><span data-translate="">owner</span>:</small>
@@ -66,13 +67,6 @@
                 </span>
               </div>
             </div>
-
-            <div
-              data-ng-if="(('group-' + md.groupOwner) | translate).indexOf('SDI_DRAFT') === 0"
-              class="gn-status-stamp gn-status-stamp-editor pull-right"
-            >
-              <span class="gn-status gn-status-mdview gn-status-obsolete">Draft</span>
-            </div>
           </div>
           <gn-draft-validation-widget
             data-ng-if="md.draft == 'e'"
@@ -125,6 +119,13 @@
             >
               <i class="fa fa-copy text-muted"></i>
             </a>
+
+            <div
+                    data-ng-if="(('group-' + md.groupOwner) | translate).indexOf('SDI_DRAFT') === 0"
+                    class="gn-status-stamp gn-status-stamp-editor"
+            >
+              <span class="gn-status gn-status-mdview gn-status-obsolete">Draft</span>
+            </div>
           </div>
         </div>
       </div>