diff --git a/src/components/feature/FeatureListTable.vue b/src/components/feature/FeatureListTable.vue
index 940810d256435c07a4defbf326fe963d5cec36f0..283bbdd2533188cc705b5edee73553683758182f 100644
--- a/src/components/feature/FeatureListTable.vue
+++ b/src/components/feature/FeatureListTable.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div
     data-tab="list"
@@ -277,7 +276,6 @@
 </template>
 
 <script>
-/* eslint-disable */
 
 import { mapState, mapGetters } from 'vuex';
 
@@ -381,14 +379,12 @@ export default {
 
     changeSort(column) {
       if (this.sort.column === column) {
-        //changer order
+        //changer only order
         this.$emit('update:sort', {
           column: this.sort.column,
           ascending: !this.sort.ascending,
         });
-      } else {
-        this.sort.column = column;
-        this.sort.ascending = true;
+      } else { // change column and reset order
         this.$emit('update:sort', { column, ascending: true });
       }
     },
diff --git a/src/components/project/ProjectMappingContextLayer.vue b/src/components/project/ProjectMappingContextLayer.vue
index 9f9fe56d3246cd35ff8f7d48504a7ab13dd2b916..be25f9ad49e1ca474af338c6a75217db80f8c94c 100644
--- a/src/components/project/ProjectMappingContextLayer.vue
+++ b/src/components/project/ProjectMappingContextLayer.vue
@@ -1,6 +1,4 @@
 <template>
-<!-- eslint-disable -->
-
   <div
     :id="layer.dataKey"
     class="ui segment layer-item"
@@ -44,7 +42,7 @@
             @click="updateLayer({ ...layer, queryable: !layer.queryable })"
           >
             <input
-              v-model="layer.queryable"
+              :checked="layer.queryable"
               type="checkbox"
               name="queryable"
             >
diff --git a/src/components/project/project_mapping_basemap.vue b/src/components/project/project_mapping_basemap.vue
index 22c2f6b9d8e861ab6a0e24179aea0aa309badcad..1665ce7cfed78797df4bce22318156a3386de8b0 100644
--- a/src/components/project/project_mapping_basemap.vue
+++ b/src/components/project/project_mapping_basemap.vue
@@ -2,13 +2,12 @@
   <div class="ui segment">
     <div class="field required">
       <label for="basemap-title">Titre</label>
-      <!-- eslint-disable -->
       <input
         :value="basemap.title"
-        @input="updateTitle"
         type="text"
         name="basemap-title"
         required
+        @input="updateTitle"
       >
       <ul
         v-if="basemap.errors && basemap.errors.length > 0"
@@ -68,8 +67,6 @@
 </template>
 
 <script>
-/* eslint-disable */
-
 import Sortable from 'sortablejs';
 import ProjectMappingContextLayer from '@/components/project/ProjectMappingContextLayer.vue';
 
@@ -135,7 +132,7 @@ export default {
     updateTitle(evt) {
       let errors = '';
       if(evt.target.value === '') { //* delete or add error message while typing
-        errors = "Veuillez compléter ce champ.";
+        errors = 'Veuillez compléter ce champ.';
       }
       this.$store.commit('map/UPDATE_BASEMAP', {
         id: this.basemap.id,