diff --git a/src/App.vue b/src/App.vue
index 1c6c42bd3..5230533af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1738,6 +1738,67 @@ tbody:last-child .empty-line:last-child {
   display: none;
 }
 
+th .input-editor,
+td .input-editor {
+  background: transparent;
+  border: 1px solid transparent;
+  color: $grey-strong;
+  height: 100%;
+  padding: 0.5rem;
+  width: 100%;
+  z-index: 100;
+
+  &:active,
+  &:focus,
+  &:hover {
+    background: transparent;
+    background: white;
+  }
+
+  &:active,
+  &:focus {
+    border: 1px solid $green;
+  }
+
+  &:hover {
+    border: 1px solid $light-green;
+  }
+
+  &:invalid,
+  &.error {
+    color: $red;
+  }
+}
+
+.dark {
+  th .input-editor,
+  td .select select,
+  td .input-editor {
+    color: $white;
+
+    option {
+      background: $dark-grey-light;
+      color: $white;
+    }
+
+    &:focus,
+    &:active,
+    &:hover {
+      background: $dark-grey-light;
+    }
+  }
+}
+
+td.frames,
+td.framein,
+td.frameout,
+td.max-retakes,
+td.resolution,
+td.fps {
+  height: 3.1rem;
+  padding: 0;
+}
+
 .resizable {
   th {
     .resizable-knob {
diff --git a/src/components/lists/AssetList.vue b/src/components/lists/AssetList.vue
index a111e3d6b..dd6134a30 100644
--- a/src/components/lists/AssetList.vue
+++ b/src/components/lists/AssetList.vue
@@ -114,6 +114,7 @@
             >
               {{ $t('assets.fields.description') }}
             </th>
+
             <th
               scope="col"
               class="time-spent number-cell"
@@ -143,6 +144,18 @@
               {{ $t('main.estimation_short') }}
             </th>
 
+            <th
+              scope="col"
+              class="resolution"
+              v-if="
+                isAssetResolution &&
+                isShowInfos &&
+                metadataDisplayHeaders.resolution
+              "
+            >
+              {{ $t('shots.fields.resolution') }}
+            </th>
+
             <metadata-header
               :key="'header' + descriptor.id"
               :descriptor="descriptor"
@@ -189,13 +202,13 @@
 
               <table-metadata-selector-menu
                 ref="headerMetadataSelectorMenu"
-                :metadata-display-headers.sync="metadataDisplayHeaders"
+                namespace="assets"
                 :descriptors="assetMetadataDescriptors"
+                :metadata-display-headers.sync="metadataDisplayHeaders"
                 :exclude="{
                   timeSpent: !isAssetTime,
                   estimation: !isAssetEstimation
                 }"
-                namespace="assets"
                 v-show="columnSelectorDisplayed && isShowInfos"
               />
 
@@ -215,7 +228,7 @@
           v-for="(group, k) in displayedAssets"
           v-if="!isLoading && isListVisible"
         >
-          <tr class="datatable-type-header">
+          <tr class="datatable-type-header" v-if="group[0]">
             <th scope="rowgroup" :colspan="visibleColumns">
               <span
                 class="datatable-row-header pointer"
@@ -383,6 +396,42 @@
               {{ formatDuration(asset.estimation) }}
             </td>
 
+            <td
+              class="resolution"
+              v-if="
+                isAssetResolution &&
+                isShowInfos &&
+                metadataDisplayHeaders.resolution
+              "
+            >
+              <input
+                :class="{
+                  'input-editor': true,
+                  error: !isValidResolution(asset)
+                }"
+                :value="
+                  getMetadataFieldValue({ field_name: 'resolution' }, asset)
+                "
+                @input="
+                  event =>
+                    onMetadataFieldChanged(
+                      asset,
+                      { field_name: 'resolution' },
+                      event
+                    )
+                "
+                @keyup.ctrl="
+                  event =>
+                    onInputKeyUp(event, getIndex(i, k), descriptorLength + 3)
+                "
+                v-if="isCurrentUserManager"
+              />
+
+              <span class="metadata-value selectable" v-else>
+                {{ getMetadataFieldValue({ field_name: 'resolution' }, asset) }}
+              </span>
+            </td>
+
             <!-- other Metadata cells -->
             <td
               class="metadata-descriptor"
@@ -567,6 +616,7 @@ export default {
       metadataDisplayHeaders: {
         estimation: true,
         readyFor: true,
+        resolution: true,
         timeSpent: true
       },
       stickedColumns: {},
@@ -593,6 +643,7 @@ export default {
       'displayedAssetsEstimation',
       'nbSelectedTasks',
       'isAssetDescription',
+      'isAssetResolution',
       'isBigThumbnails',
       'isCurrentUserClient',
       'isCurrentUserManager',
@@ -956,6 +1007,12 @@ td.estimation {
   width: 60px;
 }
 
+td.resolution {
+  min-width: 110px;
+  max-width: 110px;
+  width: 110px;
+}
+
 th.ready-for,
 td.ready-for {
   max-width: 180px;
@@ -1037,6 +1094,7 @@ input[type='number'] {
 
 // Metadata cell CSS
 
+td.resolution,
 td.metadata-descriptor {
   height: 3.1rem;
   max-width: 120px;
diff --git a/src/components/lists/EpisodeList.vue b/src/components/lists/EpisodeList.vue
index 5adfaaa63..6378acac9 100644
--- a/src/components/lists/EpisodeList.vue
+++ b/src/components/lists/EpisodeList.vue
@@ -142,6 +142,14 @@
               {{ $t('main.status') }}
             </th>
 
+            <th
+              scope="col"
+              class="resolution selectable"
+              v-if="!isCurrentUserClient && isShowInfos && isEpisodeResolution"
+            >
+              {{ $t('shots.fields.resolution') }}
+            </th>
+
             <validation-header
               :key="columnId"
               :hidden-columns="hiddenColumns"
@@ -357,6 +365,37 @@
               </span>
             </td>
 
+            <td class="resolution" v-if="isEpisodeResolution && isShowInfos">
+              <input
+                :class="{
+                  'input-editor': true,
+                  error: !isValidResolution(episode)
+                }"
+                :value="
+                  getMetadataFieldValue({ field_name: 'resolution' }, episode)
+                "
+                @input="
+                  event =>
+                    onMetadataFieldChanged(
+                      episode,
+                      { field_name: 'resolution' },
+                      event
+                    )
+                "
+                @keyup.ctrl="
+                  event =>
+                    onInputKeyUp(event, getIndex(i, k), descriptorLength + 3)
+                "
+                v-if="isCurrentUserManager"
+              />
+
+              <span class="metadata-value selectable" v-else>
+                {{
+                  getMetadataFieldValue({ field_name: 'resolution' }, episode)
+                }}
+              </span>
+            </td>
+
             <validation-cell
               :ref="`validation-${i}-${
                 j + stickedDisplayedValidationColumns.length
@@ -541,6 +580,7 @@ export default {
       'isSingleEpisode',
       'isEpisodeDescription',
       'isEpisodeEstimation',
+      'isEpisodeResolution',
       'isEpisodeTime',
       'isShowAssignations',
       'isShowInfos',
@@ -865,4 +905,10 @@ td .select {
 .metadata-value {
   padding: 0.8rem;
 }
+
+.resolution {
+  min-width: 110px;
+  max-width: 110px;
+  width: 110px;
+}
 </style>
diff --git a/src/components/lists/SequenceList.vue b/src/components/lists/SequenceList.vue
index f51f442bf..7db3c04f4 100644
--- a/src/components/lists/SequenceList.vue
+++ b/src/components/lists/SequenceList.vue
@@ -100,6 +100,14 @@
               {{ $t('sequences.fields.description') }}
             </th>
 
+            <th
+              scope="col"
+              class="resolution"
+              v-if="isSequenceResolution && isShowInfos"
+            >
+              {{ $t('shots.fields.resolution') }}
+            </th>
+
             <metadata-header
               :key="descriptor.id"
               :descriptor="descriptor"
@@ -289,6 +297,37 @@
               "
             />
 
+            <td class="resolution" v-if="isSequenceResolution && isShowInfos">
+              <input
+                :class="{
+                  'input-editor': true,
+                  error: !isValidResolution(sequence)
+                }"
+                :value="
+                  getMetadataFieldValue({ field_name: 'resolution' }, sequence)
+                "
+                @input="
+                  event =>
+                    onMetadataFieldChanged(
+                      sequence,
+                      { field_name: 'resolution' },
+                      event
+                    )
+                "
+                @keyup.ctrl="
+                  event =>
+                    onInputKeyUp(event, getIndex(i, k), descriptorLength + 3)
+                "
+                v-if="isCurrentUserManager"
+              />
+
+              <span class="metadata-value selectable" v-else>
+                {{
+                  getMetadataFieldValue({ field_name: 'resolution' }, sequence)
+                }}
+              </span>
+            </td>
+
             <!-- other Metadata cells -->
             <td
               class="metadata-descriptor"
@@ -506,6 +545,7 @@ export default {
       'isSingleSequence',
       'isSequenceDescription',
       'isSequenceEstimation',
+      'isSequenceResolution',
       'isSequenceTime',
       'isShowAssignations',
       'isShowInfos',
@@ -695,6 +735,12 @@ th.actions {
   width: 70px;
 }
 
+td.resolution {
+  min-width: 110px;
+  max-width: 110px;
+  width: 110px;
+}
+
 td.name {
   font-size: 1.2em;
 }
diff --git a/src/components/lists/ShotList.vue b/src/components/lists/ShotList.vue
index c6cd5b126..c279dd097 100644
--- a/src/components/lists/ShotList.vue
+++ b/src/components/lists/ShotList.vue
@@ -1244,67 +1244,6 @@ span.thumbnail-empty {
   cursor: pointer;
 }
 
-.dark {
-  th .input-editor,
-  td .select select,
-  td .input-editor {
-    color: $white;
-
-    option {
-      background: $dark-grey-light;
-      color: $white;
-    }
-
-    &:focus,
-    &:active,
-    &:hover {
-      background: $dark-grey-light;
-    }
-  }
-}
-
-td.frames,
-td.framein,
-td.frameout,
-td.max-retakes,
-td.resolution,
-td.fps {
-  height: 3.1rem;
-  padding: 0;
-}
-
-th .input-editor,
-td .input-editor {
-  color: $grey-strong;
-  height: 100%;
-  padding: 0.5rem;
-  width: 100%;
-  background: transparent;
-  border: 1px solid transparent;
-  z-index: 100;
-
-  &:active,
-  &:focus,
-  &:hover {
-    background: transparent;
-    background: white;
-  }
-
-  &:active,
-  &:focus {
-    border: 1px solid $green;
-  }
-
-  &:hover {
-    border: 1px solid $light-green;
-  }
-
-  &:invalid,
-  &.error {
-    color: $red;
-  }
-}
-
 input[type='number']::-webkit-outer-spin-button,
 input[type='number']::-webkit-inner-spin-button {
   -webkit-appearance: none;
diff --git a/src/components/modals/EditAssetModal.vue b/src/components/modals/EditAssetModal.vue
index 5f5b6d513..e5a7eb438 100644
--- a/src/components/modals/EditAssetModal.vue
+++ b/src/components/modals/EditAssetModal.vue
@@ -35,6 +35,12 @@
             @enter="runConfirmation"
             v-focus
           />
+          <text-field
+            ref="resolutionField"
+            :label="$t('shots.fields.resolution')"
+            v-model="form.data.resolution"
+            @enter="runConfirmation"
+          />
           <textarea-field
             ref="descriptionField"
             :label="$t('assets.fields.description')"
@@ -156,7 +162,9 @@ export default {
         name: '',
         description: '',
         source_id: null,
-        data: {},
+        data: {
+          resolution: ''
+        },
         is_shared: 'false'
       },
       assetSuccessText: ''
@@ -183,6 +191,10 @@ export default {
       'openProductions'
     ]),
 
+    resolution() {
+      return this.assetToEdit.data?.resolution || ''
+    },
+
     episodeOptions() {
       const options = this.episodes.map(episode => {
         return {
@@ -270,7 +282,11 @@ export default {
           name: this.assetToEdit.name,
           description: this.assetToEdit.description,
           source_id: this.assetToEdit.source_id || this.assetToEdit.episode_id,
-          data: { ...this.assetToEdit.data } || {},
+          data:
+            {
+              ...this.assetToEdit.data,
+              resolution: this.assetToEdit.data.resolution || ''
+            } || {},
           is_shared: String(this.assetToEdit.is_shared === true)
         }
       }
diff --git a/src/components/modals/EditEditModal.vue b/src/components/modals/EditEditModal.vue
index bd0bc5a80..6d00fe628 100644
--- a/src/components/modals/EditEditModal.vue
+++ b/src/components/modals/EditEditModal.vue
@@ -30,6 +30,12 @@
             @enter="runConfirmation"
             v-focus
           />
+          <text-field
+            ref="resolutionField"
+            :label="$t('shots.fields.resolution')"
+            @enter="runConfirmation"
+            v-model="form.data.resolution"
+          />
           <textarea-field
             ref="descriptionField"
             :label="$t('edits.fields.description')"
@@ -117,7 +123,9 @@ export default {
         name: '',
         description: '',
         parent_id: null,
-        data: {}
+        data: {
+          resolution: ''
+        }
       },
       editSuccessText: ''
     }
@@ -182,14 +190,20 @@ export default {
         this.form.parent_id = this.currentEpisode
           ? this.currentEpisode.id
           : null
-        this.form.data = {}
+        this.form.data = {
+          resolution: ''
+        }
       } else {
         this.form = {
           project_id: this.editToEdit.project_id,
           name: this.editToEdit.name,
           description: this.editToEdit.description,
           parent_id: this.editToEdit.parent_id,
-          data: { ...this.editToEdit.data } || {}
+          data:
+            {
+              ...this.editToEdit.data,
+              resolution: this.editToEdit.data.resolution || ''
+            } || {}
         }
       }
     }
diff --git a/src/components/modals/EditEpisodeModal.vue b/src/components/modals/EditEpisodeModal.vue
index a0e004932..873919741 100644
--- a/src/components/modals/EditEpisodeModal.vue
+++ b/src/components/modals/EditEpisodeModal.vue
@@ -32,6 +32,13 @@
             v-model="form.status"
           />
 
+          <text-field
+            ref="resolutionField"
+            :label="$t('shots.fields.resolution')"
+            v-model="form.data.resolution"
+            @enter="runConfirmation"
+          />
+
           <textarea-field
             ref="descriptionField"
             :label="$t('episodes.fields.description')"
@@ -112,7 +119,9 @@ export default {
       name: '',
       description: '',
       fps: '',
-      data: {}
+      data: {
+        resolution: ''
+      }
     }
     if (this.episodeToEdit && this.episodeToEdit.id) {
       form = {
@@ -120,7 +129,11 @@ export default {
         name: this.episodeToEdit.name,
         description: this.episodeToEdit.description,
         production_id: this.episodeToEdit.project_id,
-        data: this.episodeToEdit.data || {}
+        data:
+          {
+            ...this.episodeToEdit.data,
+            resolution: this.episodeToEdit.data.resolution || ''
+          } || {}
       }
     }
     return {
@@ -162,7 +175,11 @@ export default {
           name: this.episodeToEdit.name,
           status: this.episodeToEdit.status,
           description: this.episodeToEdit.description,
-          data: this.episodeToEdit.data || {}
+          data:
+            {
+              ...this.episodeToEdit.data,
+              resolution: this.episodeToEdit.data.resolution || ''
+            } || {}
         }
       }
     }
diff --git a/src/components/modals/EditSequenceModal.vue b/src/components/modals/EditSequenceModal.vue
index a7c2c9509..8979b01fa 100644
--- a/src/components/modals/EditSequenceModal.vue
+++ b/src/components/modals/EditSequenceModal.vue
@@ -24,6 +24,12 @@
             @enter="runConfirmation"
             v-focus
           />
+          <text-field
+            ref="resolutionField"
+            :label="$t('shots.fields.resolution')"
+            v-model="form.data.resolution"
+            @enter="runConfirmation"
+          />
           <textarea-field
             ref="descriptionField"
             :label="$t('sequences.fields.description')"
@@ -31,7 +37,6 @@
             @keyup.meta.enter="runConfirmation"
             v-model="form.description"
           />
-
           <metadata-field
             :key="descriptor.id"
             :descriptor="descriptor"
@@ -104,7 +109,11 @@ export default {
           name: this.sequenceToEdit.name,
           description: this.sequenceToEdit.description,
           production_id: this.sequenceToEdit.project_id,
-          data: this.sequenceToEdit.data || {}
+          data:
+            {
+              ...this.sequenceToEdit.data,
+              resolution: this.sequenceToEdit.data.resolution || ''
+            } || {}
         },
         sequenceSuccessText: ''
       }
@@ -114,7 +123,9 @@ export default {
           id: '',
           name: '',
           description: '',
-          data: {}
+          data: {
+            resolution: ''
+          }
         },
         sequenceSuccessText: ''
       }
@@ -144,12 +155,19 @@ export default {
         this.form.id = null
         this.form.name = ''
         this.form.description = ''
+        this.form.data = {
+          resolution: ''
+        }
       } else {
         this.form = {
           id: this.sequenceToEdit.id,
           name: this.sequenceToEdit.name,
           description: this.sequenceToEdit.description,
-          data: this.sequenceToEdit.data || {}
+          data:
+            {
+              ...this.sequenceToEdit.data,
+              resolution: this.sequenceToEdit.data.resolution || ''
+            } || {}
         }
       }
     }
diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue
index e1628dfee..a4a587579 100644
--- a/src/components/pages/Breakdown.vue
+++ b/src/components/pages/Breakdown.vue
@@ -925,41 +925,34 @@ export default {
       }
     },
 
-    addOneAsset(assetId) {
+    async addOneAsset(assetId, amount = 1) {
       this.isLocked = true
-      Object.keys(this.selection)
-        .filter(key => this.selection[key])
-        .forEach(entityId => {
-          this.addAssetToCasting({
-            entityId,
-            assetId,
-            nbOccurences: 1,
-            label: this.castingType === 'shot' ? 'animate' : 'fixed'
-          })
-          delete this.saveErrors[entityId]
-          this.saveCasting(entityId)
-            .then(this.setLock)
-            .catch(err => {
-              this.saveErrors[entityId] = true
-              console.error(err)
-            })
+      const entityIds = Object.keys(this.selection).filter(
+        key => this.selection[key]
+      )
+
+      for (const entityId of entityIds) {
+        this.addAssetToCasting({
+          entityId,
+          assetId,
+          nbOccurences: amount,
+          label: this.castingType === 'shot' ? 'animate' : 'fixed'
         })
+
+        delete this.saveErrors[entityId]
+
+        try {
+          await this.saveCasting(entityId)
+          this.setLock()
+        } catch (err) {
+          this.saveErrors[entityId] = true
+          console.error(err)
+        }
+      }
     },
 
-    addTenAssets(assetId) {
-      this.isLocked = true
-      Object.keys(this.selection)
-        .filter(key => this.selection[key])
-        .forEach(entityId => {
-          this.addAssetToCasting({ entityId, assetId, nbOccurences: 10 })
-          delete this.saveErrors[entityId]
-          this.saveCasting(entityId)
-            .then(this.setLock)
-            .catch(err => {
-              this.saveErrors[entityId] = true
-              console.error(err)
-            })
-        })
+    async addTenAssets(assetId) {
+      this.addOneAsset(assetId, 10)
     },
 
     confirmAssetRemoval() {
@@ -974,7 +967,7 @@ export default {
       this.loading.remove = true
       this.removeAssetFromCasting({ entityId, assetId, nbOccurences })
       delete this.saveErrors[entityId]
-      this.saveCasting(entityId)
+      return this.saveCasting(entityId)
         .then(() => {
           this.setLock()
           this.modals.isRemoveConfirmationDisplayed = false
@@ -989,34 +982,27 @@ export default {
         })
     },
 
-    removeOneAssetFromSelection(assetId) {
-      Object.keys(this.selection)
-        .filter(key => this.selection[key])
-        .forEach(entityId => {
-          const nbOccurences = this.casting[entityId].find(
-            asset => asset.asset_id === assetId
-          ).nb_occurences
-          this.removeOneAsset(assetId, entityId, nbOccurences)
-        })
-    },
+    async removeOneAssetFromSelection(assetId) {
+      const entityIds = Object.keys(this.selection).filter(
+        key => this.selection[key]
+      )
 
-    removeOneAsset(assetId, entityId, nbOccurences) {
-      this.isLocked = true
-      if (this.isEpisodeCasting && nbOccurences === 1) {
-        this.removalData = { assetId, entityId, nbOccurences }
-        this.modals.isRemoveConfirmationDisplayed = true
-      } else {
-        this.saveAssetRemoval(entityId, assetId, 1)
+      for (const entityId of entityIds) {
+        const nbOccurences = this.casting[entityId].find(
+          asset => asset.asset_id === assetId
+        ).nb_occurences
+        await this.removeOneAsset(assetId, entityId, nbOccurences)
       }
     },
 
-    removeTenAssets(assetId, entityId, nbOccurences) {
+    removeOneAsset(assetId, entityId, nbOccurences) {
       this.isLocked = true
-      if (this.isEpisodeCasting && nbOccurences < 10) {
+      if (this.isEpisodeCasting && nbOccurences === 1) {
         this.removalData = { assetId, entityId, nbOccurences }
         this.modals.isRemoveConfirmationDisplayed = true
+        return Promise.resolve()
       } else {
-        this.saveAssetRemoval(entityId, assetId, 10)
+        return this.saveAssetRemoval(entityId, assetId, 1)
       }
     },
 
@@ -1249,25 +1235,25 @@ export default {
       clipboard.copyCasting(selectedCasting)
     },
 
-    pasteCasting() {
+    async pasteCasting() {
       const castingToPaste = clipboard.pasteCasting()
       if (!castingToPaste || castingToPaste.length === 0) return
       const selectedElements = Object.keys(this.selection).filter(
         key => this.selection[key]
       )
-      selectedElements.forEach(entityId => {
+      for (const entityId of selectedElements) {
         this.setEntityCasting({
           entityId,
           casting: castingToPaste
         })
         delete this.saveErrors[entityId]
-        this.saveCasting(entityId)
+        await this.saveCasting(entityId)
           .then(this.setLock)
           .catch(err => {
             this.saveErrors[entityId] = true
             console.error(err)
           })
-      })
+      }
       return castingToPaste
     },
 
diff --git a/src/components/pages/breakdown/ShotLine.vue b/src/components/pages/breakdown/ShotLine.vue
index abe81caf6..31f440eac 100644
--- a/src/components/pages/breakdown/ShotLine.vue
+++ b/src/components/pages/breakdown/ShotLine.vue
@@ -138,16 +138,18 @@
       :key="'desc' + entity.id + '-' + descriptor.id"
       :style="{
         'min-width': columnWidth[descriptor.id]
+          ? columnWidth[descriptor.id] + 'px'
+          : '110px',
+        'max-width': columnWidth[descriptor.id]
           ? columnWidth[descriptor.id] + 'px'
           : '110px'
       }"
-      v-for="(descriptor, j) in visibleMetadataDescriptors"
+      v-for="descriptor in visibleMetadataDescriptors"
       v-if="isShowInfosBreakdown"
     >
       <input
         class="input-editor"
         @input="event => onMetadataFieldChanged(entity, descriptor, event)"
-        @keyup.ctrl="event => onInputKeyUp(event, getIndex(i, k), j)"
         :value="getMetadataFieldValue(descriptor, entity)"
         v-if="
           descriptor.choices.length === 0 &&
@@ -216,7 +218,6 @@
       >
         <select
           class="select-input"
-          @keyup.ctrl="event => onInputKeyUp(event, getIndex(i, k), j)"
           @change="event => onMetadataFieldChanged(entity, descriptor, event)"
         >
           <option
diff --git a/src/locales/en.js b/src/locales/en.js
index c416a5d7d..7ef323355 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -1289,6 +1289,7 @@ export default {
     delete_error: 'An error occurred while deleting this edit. There may be existing data currently linked to it.',
     delete_for_selection: 'Delete the selected edit | Delete the {nbSelectedEdits} selected edits',
     edit_error: 'An error occurred while saving this edit. Are you sure there is no edit with a similar name?',
+    edit_success: 'Modifications were saved successfully.',
     edit_title: 'Change edit',
     empty_list: 'There are no edits in the production. How about creating some?',
     empty_list_client: 'There are no edits in this production.',
@@ -1649,9 +1650,9 @@ export default {
     asset_library: 'Asset Library',
     from_library: 'From the asset library',
     import_from_asset_type: 'Import all assets from selected type and production',
-    import_from_production: 'Import all assets from selected production',
     import_from_assets: 'Import assets from the selected production and asset type',
     import_from_list: 'Import selected assets from the list',
+    import_from_production: 'Import all assets from selected production',
     manage: 'Add assets to your library',
     no_entities: 'No entities are available',
     no_open_productions: 'No open productions',
diff --git a/src/store/api/assets.js b/src/store/api/assets.js
index f022063a9..e070af29e 100644
--- a/src/store/api/assets.js
+++ b/src/store/api/assets.js
@@ -46,6 +46,9 @@ export default {
     if (asset.source_id !== 'null') {
       data.episode_id = asset.source_id
     }
+    if (asset.data.resolution) {
+      data.data.resolution = asset.data.resolution
+    }
 
     const path =
       `/api/data/projects/${asset.project_id}/asset-types/` +
@@ -69,6 +72,9 @@ export default {
     if (asset.source_id === 'null' || asset.source_id) {
       data.source_id = asset.source_id
     }
+    if (asset.data.resolution) {
+      data.data.resolution = asset.data.resolution
+    }
     return client.pput(`/api/data/entities/${asset.id}`, data)
   },
 
diff --git a/src/store/api/breakdown.js b/src/store/api/breakdown.js
index 875e43643..96a95e251 100644
--- a/src/store/api/breakdown.js
+++ b/src/store/api/breakdown.js
@@ -19,9 +19,8 @@ export default {
     return client.pget(path)
   },
 
-  updateCasting(productionId, shotId, casting, callback) {
-    // TODO rename shotId to entityId
-    const path = `/api/data/projects/${productionId}/entities/${shotId}/casting`
+  updateCasting(productionId, entityId, casting, callback) {
+    const path = `/api/data/projects/${productionId}/entities/${entityId}/casting`
     return client.pput(path, casting)
   },
 
diff --git a/src/store/api/edits.js b/src/store/api/edits.js
index 7b12d3e8b..953e9fb9f 100644
--- a/src/store/api/edits.js
+++ b/src/store/api/edits.js
@@ -28,7 +28,11 @@ export default {
   newEdit(edit) {
     const data = {
       name: edit.name,
-      description: edit.description
+      description: edit.description,
+      data: {}
+    }
+    if (edit.data.resolution) {
+      data.data.resolution = edit.resolution
     }
     if (edit.parent_id !== 'null') {
       data.episode_id = edit.parent_id
@@ -40,7 +44,10 @@ export default {
     const data = {
       name: edit.name,
       description: edit.description,
-      data: edit.data
+      data: edit.data || {}
+    }
+    if (edit.data.resolution) {
+      data.data.resolution = edit.data.resolution
     }
     if (edit.parent_id === 'null' || edit.parent_id) {
       data.parent_id = edit.parent_id
diff --git a/src/store/api/shots.js b/src/store/api/shots.js
index 8df2926f3..94fe01619 100644
--- a/src/store/api/shots.js
+++ b/src/store/api/shots.js
@@ -62,6 +62,9 @@ export default {
       description: sequence.description,
       data: sequence.data
     }
+    if (sequence.data.resolution) {
+      data.data.resolution = sequence.data.resolution
+    }
     const path = `/api/data/projects/${sequence.project_id}/sequences`
     return client.ppost(path, data)
   },
@@ -73,6 +76,9 @@ export default {
       status: episode.status || 'running',
       data: episode.data || {}
     }
+    if (episode.data.resolution) {
+      data.data.resolution = episode.data.resolution
+    }
     const path = `/api/data/projects/${episode.project_id}/episodes`
     return client.ppost(path, data)
   },
@@ -119,6 +125,9 @@ export default {
       description: sequence.description,
       data: sequence.data
     }
+    if (sequence.data.resolution) {
+      data.data.resolution = sequence.data.resolution
+    }
     return client.pput(`/api/data/entities/${sequence.id}`, data)
   },
 
@@ -129,6 +138,9 @@ export default {
       status: episode.status,
       data: episode.data
     }
+    if (episode.data.resolution) {
+      data.data.resolution = episode.data.resolution
+    }
     if (episode.is_casting_standby !== undefined) {
       data.is_casting_standby = Boolean(episode.is_casting_standby)
     }
diff --git a/src/store/modules/assets.js b/src/store/modules/assets.js
index f46ddfe04..794c4fb04 100644
--- a/src/store/modules/assets.js
+++ b/src/store/modules/assets.js
@@ -304,6 +304,7 @@ const initialState = {
   isAssetsLoadingError: false,
   isAssetDescription: false,
   isAssetEstimation: false,
+  isAssetResolution: false,
   isAssetTime: false,
   assetsCsvFormData: null,
 
@@ -365,6 +366,7 @@ const getters = {
   isAssetEstimation: state => state.isAssetEstimation,
   isAssetTime: state => state.isAssetTime,
   isAssetDescription: state => state.isAssetDescription,
+  isAssetResolution: state => state.isAssetResolution,
 
   assetsCsvFormData: state => state.assetsCsvFormData,
 
@@ -899,6 +901,7 @@ const mutations = {
     let isTime = false
     let isEstimation = false
     let isDescription = false
+    let isResolution = false
     assets = sortAssets(assets)
     cache.assets = assets
     cache.result = assets
@@ -919,6 +922,7 @@ const mutations = {
       if (!isTime && asset.timeSpent > 0) isTime = true
       if (!isEstimation && asset.estimation > 0) isEstimation = true
       if (!isDescription && asset.description) isDescription = true
+      if (!isResolution && asset.data?.resolution) isResolution = true
     })
 
     const assetTypes = Array.from(assetTypeMap.values())
@@ -934,6 +938,7 @@ const mutations = {
     state.isAssetTime = isTime
     state.isAssetEstimation = isEstimation
     state.isAssetDescription = isDescription
+    state.isAssetResolution = isResolution
 
     state.isAssetsLoading = false
     state.isAssetsLoadingError = false
diff --git a/src/store/modules/edits.js b/src/store/modules/edits.js
index 02ed08e86..fac2c067a 100644
--- a/src/store/modules/edits.js
+++ b/src/store/modules/edits.js
@@ -259,6 +259,7 @@ const initialState = {
   isEditDescription: false,
   isEditEstimation: false,
   isEditTime: false,
+  isEditResolution: false,
 
   displayedEdits: [],
   displayedEditsCount: 0,
@@ -296,6 +297,7 @@ const getters = {
   isEditDescription: state => state.isEditDescription,
   isEditEstimation: state => state.isEditEstimation,
   isEditTime: state => state.isEditTime,
+  isEditResolution: state => state.isEditResolution,
 
   editSearchText: state => state.editSearchText,
   editSelectionGrid: state => state.editSelectionGrid,
@@ -432,6 +434,7 @@ const actions = {
   editEdit({ commit, state }, data) {
     commit(LOCK_EDIT, data)
     commit(EDIT_EDIT_END, data)
+    console.log('editEdit', JSON.stringify(data, null, 2))
     return editsApi.updateEdit(data).finally(() => {
       setTimeout(() => {
         commit(UNLOCK_EDIT, data)
@@ -704,6 +707,7 @@ const mutations = {
     let isDescription = false
     let isTime = false
     let isEstimation = false
+    let isResolution = false
     state.editMap = new Map()
     edits.forEach(edit => {
       const taskIds = []
@@ -740,6 +744,7 @@ const mutations = {
       if (!isTime && edit.timeSpent > 0) isTime = true
       if (!isEstimation && edit.estimation > 0) isEstimation = true
       if (!isDescription && edit.description) isDescription = true
+      if (!isResolution && edit.resolution) isResolution = true
 
       state.editMap.set(edit.id, edit)
     })
@@ -761,6 +766,7 @@ const mutations = {
     state.isEditTime = isTime
     state.isEditEstimation = isEstimation
     state.isEditDescription = isDescription
+    state.isEditResolution = isResolution
 
     state.isEditsLoading = false
     state.isEditsLoadingError = false
@@ -846,6 +852,9 @@ const mutations = {
     if (edit.description && !state.isEditDescription) {
       state.isEditDescription = true
     }
+    if (edit.resolution && !state.isEditResolution) {
+      state.isEditResolution = true
+    }
   },
 
   [RESTORE_EDIT_END](state, editToRestore) {
diff --git a/src/store/modules/episodes.js b/src/store/modules/episodes.js
index 621cc6e48..6663decb8 100644
--- a/src/store/modules/episodes.js
+++ b/src/store/modules/episodes.js
@@ -184,6 +184,7 @@ const initialState = {
   episodeValidationColumns: [],
   isEpisodeDescription: false,
   isEpisodeEstimation: false,
+  isEpisodeResolution: false,
   isEpisodeTime: false,
   isEpisodesLoading: false,
   isEpisodesLoadingError: false,
@@ -213,6 +214,7 @@ const getters = {
   displayedEpisodesEstimation: state => state.displayedEpisodesEstimation,
   displayedEpisodesTimeSpent: state => state.displayedEpisodesTimeSpent,
   isEpisodeDescription: state => state.isEpisodeDescription,
+  isEpisodeResolution: state => state.isEpisodeResolution,
   isEpisodeEstimation: state => state.isEpisodeEstimation,
   isEpisodeTime: state => state.isEpisodeTime,
 
@@ -590,6 +592,7 @@ const mutations = {
     let isDescription = false
     let isTime = false
     let isEstimation = false
+    let isResolution = false
     state.episodeMap = new Map()
     episodes.forEach(episode => {
       const taskIds = []
@@ -633,6 +636,7 @@ const mutations = {
       if (!isTime && episode.timeSpent > 0) isTime = true
       if (!isEstimation && episode.estimation > 0) isEstimation = true
       if (!isDescription && episode.description) isDescription = true
+      if (!isResolution && episode.data.resolution) isResolution = true
 
       state.episodeMap.set(episode.id, episode)
     })
@@ -655,6 +659,7 @@ const mutations = {
     state.isEpisodeTime = isTime
     state.isEpisodeEstimation = isEstimation
     state.isEpisodeDescription = isDescription
+    state.isEpisodeResolution = isResolution
 
     state.isEpisodesLoading = false
     state.isEpisodesLoadingError = false
@@ -741,6 +746,9 @@ const mutations = {
     if (episode.description && !state.isEpisodeDescription) {
       state.isEpisodeDescription = true
     }
+    if (episode.resolution && !state.isEpisodeResolution) {
+      state.isEpisodeResolution = true
+    }
   },
 
   [LOAD_EPISODES_START](state) {
diff --git a/src/store/modules/sequences.js b/src/store/modules/sequences.js
index c5b9917d3..23583f2c6 100644
--- a/src/store/modules/sequences.js
+++ b/src/store/modules/sequences.js
@@ -192,6 +192,7 @@ const initialState = {
   sequenceValidationColumns: [],
   isSequenceDescription: false,
   isSequenceEstimation: false,
+  isSequenceResolution: false,
   isSequenceTime: false,
   isSequencesLoading: false,
   isSequencesLoadingError: false,
@@ -223,6 +224,7 @@ const getters = {
   displayedSequencesTimeSpent: state => state.displayedSequencesTimeSpent,
   isSequenceDescription: state => state.isSequenceDescription,
   isSequenceEstimation: state => state.isSequenceEstimation,
+  isSequenceResolution: state => state.isSequenceResolution,
   isSequenceTime: state => state.isSequenceTime,
 
   sequences: state => cache.sequences,
@@ -622,6 +624,7 @@ const mutations = {
     let isDescription = false
     let isTime = false
     let isEstimation = false
+    let isResolution = false
     state.sequenceMap = new Map()
     sequences.forEach(sequence => {
       const taskIds = []
@@ -669,6 +672,7 @@ const mutations = {
       if (!isTime && sequence.timeSpent > 0) isTime = true
       if (!isEstimation && sequence.estimation > 0) isEstimation = true
       if (!isDescription && sequence.description) isDescription = true
+      if (!isResolution && sequence.data.resolution) isResolution = true
 
       state.sequenceMap.set(sequence.id, sequence)
     })
@@ -691,6 +695,7 @@ const mutations = {
     state.isSequenceTime = isTime
     state.isSequenceEstimation = isEstimation
     state.isSequenceDescription = isDescription
+    state.isSequenceResolution = isResolution
 
     state.isSequencesLoading = false
     state.isSequencesLoadingError = false
@@ -784,6 +789,9 @@ const mutations = {
     if (sequence.description && !state.isSequenceDescription) {
       state.isSequenceDescription = true
     }
+    if (sequence.data.resolution && !state.isSequenceResolution) {
+      state.isSequenceResolution = true
+    }
   },
 
   [LOAD_SEQUENCES_START](state) {
diff --git a/src/store/modules/tasktypes.js b/src/store/modules/tasktypes.js
index e5f39b320..989323ef0 100644
--- a/src/store/modules/tasktypes.js
+++ b/src/store/modules/tasktypes.js
@@ -33,7 +33,9 @@ const getters = {
   sequenceSubscriptions: state => state.sequenceSubscriptions,
 
   currentTaskType: (state, getters, rootState) => {
-    return state.taskTypeMap.get(rootState.route.params.task_type_id) || {}
+    const route = rootState.route || {}
+    const params = route.params || {}
+    return state.taskTypeMap.get(params.task_type_id) || {}
   },
 
   assetTaskTypes: (state, getters, rootState, rootGetters) => {
diff --git a/tests/unit/store/assets.spec.js b/tests/unit/store/assets.spec.js
index c19b00653..adfc9d669 100644
--- a/tests/unit/store/assets.spec.js
+++ b/tests/unit/store/assets.spec.js
@@ -791,10 +791,10 @@ describe('Assets store', () => {
       expect(state).toEqual({
         assetMap: new Map(),
         assetValidationColumns: [],
-        displayedAssets: [],
         assetFilledColumns: {},
         assetSearchFilterGroups: [],
         assetSearchQueries: [],
+        displayedAssets: [],
         displayedAssetsCount: 0,
         displayedAssetsLength: 0,
         displayedAssetsTimeSpent: 0,
@@ -987,6 +987,7 @@ describe('Assets store', () => {
         isAssetTime: false,
         isAssetEstimation: false,
         isAssetDescription: true,
+        isAssetResolution: false,
         assetValidationColumns: [],
         nbValidationColumns: 0,
         displayedAssets: store.cache.assets,
@@ -2002,6 +2003,7 @@ describe('Assets store', () => {
         isAssetDescription: false,
         isAssetEstimation: false,
         isAssetTime: false,
+        isAssetResolution: false,
         isAssetsLoading: false,
         isAssetsLoadingError: false,
         nbValidationColumns: 0,