diff --git a/package.json b/package.json
index 411785c8..771db434 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "url": "git://github.com/AdFabConnect/abejs.git"
   },
   "scripts": {
-    "lint": "eslint src",
+    "lint": "eslint src --fix",
     "test": "mocha --compilers js:babel-register --require babel-polyfill",
     "test-cov": "istanbul cover _mocha -- --compilers js:babel-register --require babel-polyfill",
     "test-coveralls": "istanbul cover _mocha --report lcovonly -- --compilers js:babel-register --require babel-polyfill -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
diff --git a/src/cli/controllers/Save.js b/src/cli/controllers/Save.js
index 91bd9d91..382e35b7 100755
--- a/src/cli/controllers/Save.js
+++ b/src/cli/controllers/Save.js
@@ -206,7 +206,7 @@ export function saveJson(url, json) {
       if (typeof obj[k] === 'object' && obj[k] !== null){
         eachRecursive(obj[k])
       } else if (typeof obj[k] !== 'undefined' && obj[k] !== null){
-       obj[k] = xss(obj[k].toString().replace(/"/g, '"'), { 'whiteList': config.htmlWhiteList })
+        obj[k] = xss(obj[k].toString().replace(/"/g, '"'), { 'whiteList': config.htmlWhiteList })
       }
     }
   }
diff --git a/src/cli/helpers/abe-sql.js b/src/cli/helpers/abe-sql.js
index 9946aaf1..1a28756c 100755
--- a/src/cli/helpers/abe-sql.js
+++ b/src/cli/helpers/abe-sql.js
@@ -393,7 +393,7 @@ export default class Sql {
                 jsonValues[column] = json[column]
               }
             })
-            jsonValues["abe_meta"] = json["abe_meta"]
+            jsonValues['abe_meta'] = json['abe_meta']
           }else {
             jsonValues = json
           }
@@ -553,8 +553,8 @@ export default class Sql {
         var compare
 
         if((where.left === 'template' || where.left === 'abe_meta.template')
-          && typeof jsonDoc["abe_meta"] !== 'undefined' && jsonDoc["abe_meta"] !== null) {
-          value = FileParser.getTemplate(jsonDoc["abe_meta"].template)
+          && typeof jsonDoc['abe_meta'] !== 'undefined' && jsonDoc['abe_meta'] !== null) {
+          value = FileParser.getTemplate(jsonDoc['abe_meta'].template)
         }else {
           try {
             value = eval('jsonDoc.' + where.left)
diff --git a/src/server/public/scripts/modules/EditorAutocomplete.js b/src/server/public/scripts/modules/EditorAutocomplete.js
index 61ee5811..25a31ef5 100755
--- a/src/server/public/scripts/modules/EditorAutocomplete.js
+++ b/src/server/public/scripts/modules/EditorAutocomplete.js
@@ -124,7 +124,7 @@ export default class EditorAutocomplete {
   }
 
   _select(target) {
-    var val = JSON.parse(target.getAttribute('data-value').replace(/&quote;/g, "'"))
+    var val = JSON.parse(target.getAttribute('data-value').replace(/&quote;/g, '\''))
     var maxLength = this._currentInput.getAttribute('data-maxlength')
     if(typeof maxLength !== 'undefined' && maxLength !== null && maxLength !== '') {
       maxLength = parseInt(maxLength)
@@ -137,7 +137,7 @@ export default class EditorAutocomplete {
     var div = document.createElement('div')
     div.classList.add('autocomplete-result')
     div.setAttribute('data-parent-id', this._currentInput.getAttribute('data-id'))
-    div.setAttribute('value', target.getAttribute('data-value').replace(/&quote;/g, "'"))
+    div.setAttribute('value', target.getAttribute('data-value').replace(/&quote;/g, '\''))
     div.innerHTML = `${this._deep_value_array(val, display)}`
 
     var resWrapper = this._divWrapper.parentNode.querySelector('.autocomplete-result-wrapper')
@@ -217,7 +217,7 @@ export default class EditorAutocomplete {
       }else {
         this._previousValue = val
       }
-      var dataVal = target.getAttribute('data-value').replace(/&quote;/g, "'")
+      var dataVal = target.getAttribute('data-value').replace(/&quote;/g, '\'')
 
       if (dataVal.indexOf('http') === 0) {
         this._ajax(
@@ -231,7 +231,7 @@ export default class EditorAutocomplete {
             this._showAutocomplete(JSON.parse(responseText), target, val)
           })
       }else {
-        var sources = JSON.parse(target.getAttribute('data-value').replace(/&quote;/g, "'"))
+        var sources = JSON.parse(target.getAttribute('data-value').replace(/&quote;/g, '\''))
         this._showAutocomplete(sources, target, val)
       }
     }else {
@@ -329,7 +329,7 @@ export default class EditorAutocomplete {
   _deep_value_array(obj, path) {
 
     if(path.indexOf('.') === -1) {
-      return (typeof obj[path] !== 'undefined' && obj[path] !== null) ? obj[path].replace(/&quote;/g, "'") : null
+      return (typeof obj[path] !== 'undefined' && obj[path] !== null) ? obj[path].replace(/&quote;/g, '\'') : null
     }
 
     var pathSplit = path.split('.')