diff --git a/src/components/lists/TodosList.vue b/src/components/lists/TodosList.vue
index bf3b8e091..4b00cce4f 100644
--- a/src/components/lists/TodosList.vue
+++ b/src/components/lists/TodosList.vue
@@ -41,21 +41,16 @@
             >
               {{ $t('assets.fields.description') }}
             </th>
-            <th
-              ref="th-estimation"
-              :title="$t('main.estimation')"
-              class="estimation number-cell"
-              scope="col"
-            >
-              {{ $t('tasks.fields.estimation').substring(0, 3) }}.
+            <th scope="col" class="estimation" :title="$t('main.estimation')">
+              {{ $t('main.estimation_short') }}
             </th>
-            <th ref="th-duration" class="duration number-cell" scope="col">
+            <th scope="col" class="duration number-cell">
               {{ $t('tasks.fields.duration').substring(0, 3) }}.
             </th>
-            <th v-if="!isToCheck" class="start-date" scope="col">
+            <th scope="col" class="start-date" v-if="!isToCheck">
               {{ $t('tasks.fields.start_date_short') }}
             </th>
-            <th class="due-date" scope="col">
+            <th scope="col" class="due-date">
               {{ $t('tasks.fields.due_date') }}
             </th>
             <metadata-header
@@ -147,18 +142,18 @@
             </td>
             <td class="estimation number-cell">
               <input
-                v-if="selectionGrid[entry.id]"
+                class="input"
                 :ref="entry.id + '-estimation'"
                 :value="formatDuration(entry.estimation, false)"
-                class="input"
                 min="0"
                 step="any"
                 type="number"
                 @change="updateEstimation($event.target.value)"
+                v-if="selectionGrid[entry.id]"
               />
-              <span v-else>
+              <template v-else>
                 {{ formatDuration(entry.estimation) }}
-              </span>
+              </template>
             </td>
             <td
               :class="{
@@ -171,29 +166,29 @@
             </td>
             <td class="start-date">
               <date-field
-                v-if="selectionGrid[entry.id]"
+                class="flexrow-item"
                 :disabled-dates="disabledDates"
                 :value="getDate(entry.start_date)"
                 :with-margin="false"
-                class="flexrow-item"
                 @input="updateStartDate"
+                v-if="selectionGrid[entry.id]"
               />
-              <span v-else>
+              <template v-else>
                 {{ formatDate(entry.start_date) }}
-              </span>
+              </template>
             </td>
             <td class="due-date">
               <date-field
-                v-if="selectionGrid[entry.id]"
+                class="flexrow-item"
                 :disabled-dates="disabledDates"
                 :value="getDate(entry.due_date)"
                 :with-margin="false"
-                class="flexrow-item"
                 @input="updateDueDate"
+                v-if="selectionGrid[entry.id]"
               />
-              <span v-else>
+              <template v-else>
                 {{ formatDate(entry.due_date) }}
-              </span>
+              </template>
             </td>
             <td
               class="metadata-descriptor"
@@ -254,6 +249,7 @@
               </div>
             </td>
             <validation-cell
+              class="status unselectable"
               :ref="'validation-' + i + '-0'"
               :clickable="false"
               :column="entry.taskStatus"
@@ -263,7 +259,6 @@
               :row-x="i"
               :selected="selectionGrid[entry.id]"
               :task-test="entry"
-              class="status unselectable"
             />
             <template v-if="!isToCheck">
               <last-comment-cell
@@ -345,15 +340,15 @@ export default {
 
   components: {
     EntityThumbnail,
+    DateField,
     DescriptionCell,
     LastCommentCell,
+    MetadataHeader,
     PeopleAvatar,
     ProductionNameCell,
     TableInfo,
     TaskTypeCell,
-    ValidationCell,
-    MetadataHeader,
-    DateField
+    ValidationCell
   },
 
   props: {
@@ -387,12 +382,7 @@ export default {
     }
   },
 
-  emits: [
-    'scroll',
-    'task-selection-addition',
-    'task-selection-cleared',
-    'task-selection-removal'
-  ],
+  emits: ['scroll', 'task-selected'],
 
   data() {
     return {
@@ -500,8 +490,8 @@ export default {
       'addSelectedTask',
       'addSelectedTasks',
       'clearSelectedTasks',
-      'updateTask',
-      'removeSelectedTask'
+      'removeSelectedTask',
+      'updateTask'
     ]),
 
     assetEpisodes(entry, full) {