diff --git a/src/selector_manager/view/ClassTagView.js b/src/selector_manager/view/ClassTagView.js
index 825274847..c9d9f081a 100644
--- a/src/selector_manager/view/ClassTagView.js
+++ b/src/selector_manager/view/ClassTagView.js
@@ -1,4 +1,5 @@
 var Backbone = require('backbone');
+const Selector = require('./../model/Selector');
 
 module.exports = Backbone.View.extend({
   template: _.template(`
@@ -46,7 +47,7 @@ module.exports = Backbone.View.extend({
    */
   endEditTag() {
     var value = this.$labelInput.val();
-    var next = this.model.escapeName(value);
+    var next = Selector.escapeName(value);
 
     if(this.target){
       var clsm = this.target.get('SelectorManager');
diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index 15215a1c8..1c1f45768 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -240,12 +240,10 @@ module.exports = () => {
         var state = !previewMode ? model.get('state') : '';
         var deviceW = device && !previewMode ? device.get('width') : '';
         var cssC = c.em.get('CssComposer');
-
-        var valid = _.filter(classes.models, item => item.get('active'));
-
+        var valid = classes.getStyleable();
         var CssRule = cssC.get(valid, state, deviceW);
 
-        if(CssRule) {
+        if(CssRule && valid.length) {
           return CssRule;
         }
       }
diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js
index aa852ed56..3f00c2cf0 100644
--- a/src/style_manager/view/SectorsView.js
+++ b/src/style_manager/view/SectorsView.js
@@ -46,10 +46,10 @@ module.exports = Backbone.View.extend({
     var device = em.getDeviceModel();
     var state = !previewMode ? el.get('state') : '';
     var widthMedia = device && device.get('widthMedia');
-    var mediaText = device && !previewMode && widthMedia ?
-      `(${config.mediaCondition}: ${widthMedia})` : '';
     var stateStr = state ? `:${state}` : null;
     var view = el.view;
+    var mediaText = device && !previewMode && widthMedia ?
+      `(${config.mediaCondition}: ${widthMedia})` : '';
     pt.helper = null;
 
     if (view) {