diff --git a/.gitignore b/.gitignore
index 55971823775..be3fd0d25d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ testem.log
 .env
 .idea
 .vscode
+.eslintcache
 
 /yarn-error.log
 
diff --git a/.template-lintrc.js b/.template-lintrc.js
index 17d75b5d3fe..b46508b6b9b 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -8,6 +8,7 @@ module.exports = {
       ignoredTags: ['label'] // Allow label tag inside a or any other interactive element
     },
     'link-rel-noopener': true,
+    'no-curly-component-invocation': true,
     // TODO: Remove and fix
     'require-button-type': false,
     'no-partial': false,
@@ -15,14 +16,5 @@ module.exports = {
     'no-inline-styles': false,
     'no-negated-condition': false,
     'no-invalid-meta': false, // Crashing the linter https://github.com/ember-template-lint/ember-template-lint/pull/1087
-    'no-curly-component-invocation': false,
-  },
-  overrides: [
-    {
-      files: ['**/app/templates/account/**/*.hbs', '**/app/templates/events/**/*.hbs'],
-      rules: {
-        'no-curly-component-invocation': true,
-      }
-    },
-  ]
+  }
 };
diff --git a/app/templates/components/ui-table/header-row-filtering.hbs b/app/templates/components/ui-table/header-row-filtering.hbs
index 028b4654941..990f892ec70 100644
--- a/app/templates/components/ui-table/header-row-filtering.hbs
+++ b/app/templates/components/ui-table/header-row-filtering.hbs
@@ -11,7 +11,7 @@
             {{#if column.useFilter}}
               <div class="ui input {{if column.filterUsed 'has-feedback'}}">
                 {{#if column.filterWithSelect}}
-                  {{models-select options=column.filterOptions cssPropertyName=column.cssPropertyName value=column.filterString class=(concat this.themeInstance.input 'changeFilterForColumn')}}
+                  <ModelsSelect @options={{column.filterOptions}} @cssPropertyName={{column.cssPropertyName}} @value={{column.filterString}} @class={{concat this.themeInstance.input 'changeFilterForColumn'}} />
                 {{else}}
                   <Input @type="text" @value={{column.filterString}} class={{this.themeInstance.input}} placeholder="" />
                 {{/if}}
diff --git a/config/environment.js b/config/environment.js
index c2c4eecaca8..b24ac09ea3b 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -30,7 +30,7 @@ module.exports = function(environment) {
     APP: {
       apiHost      : process.env.API_HOST || (environment === 'production' ? 'https://api.eventyay.com' : 'https://open-event-api-dev.herokuapp.com'),
       apiNamespace : process.env.API_NAMESPACE || 'v1',
-      version: process.env.npm_package_version
+      version      : process.env.npm_package_version
     },
 
     metricsAdapters: [{
diff --git a/package.json b/package.json
index 588b0deefd8..096def07dfe 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,9 @@
     "test": "ember test",
     "exam": "ember exam --launch=chrome --random",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
-    "lint:js": "eslint --fix app ember-cli-build.js testem.js tests config",
+    "lint:js": "eslint --cache --fix app ember-cli-build.js testem.js tests config",
     "lint:scss": "sass-lint -c .sass-lint.yml --verbose",
-    "lint:hbs": "ember-template-lint ."
+    "lint:hbs": "ember-template-lint --fix ."
   },
   "pre-commit": {
     "run": [