diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index d01fbebc9..17fa1e706 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -18,11 +18,23 @@
         <p v-if="isRepositoryLevel">{{ $i18n.get('info_repository_filters_inheritance') }}</p>
         <br>
         <div
-                :style="{ height: 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
+                :style="{ height: activeFilterList.length <= 0 && !isLoadingFilters ? 'auto' : 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
                 class="columns"
                 ref="filterEditionPageColumns">
             <div class="column">
-                     
+                <section 
+                        v-if="activeFilterList.length <= 0 && !isLoadingFilters"
+                        class="field is-grouped-centered section">
+                    <div class="content has-text-gray has-text-centered">
+                        <p>
+                            <span class="icon is-large">
+                                <i class="tainacan-icon tainacan-icon-36px tainacan-icon-filters"/>
+                            </span>
+                        </p>
+                        <p>{{ $i18n.get('info_there_is_no_filter' ) }}</p>  
+                        <p>{{ $i18n.get('info_create_filters' ) }}</p>
+                    </div>
+                </section>        
                 <draggable 
                         class="active-filters-area"
                         @change="handleChangeOnFilter"
@@ -35,20 +47,7 @@
                             handle: '.handle', 
                             ghostClass: 'sortable-ghost',
                             filter: 'not-sortable-item', 
-                            animation: '250'}">
-                            <section 
-                        v-if="activeFilterList.length <= 0 && !isLoadingFilters"
-                        class="field is-grouped-centered section">
-                    <div class="content has-text-gray has-text-centered">
-                        <p>
-                            <span class="icon is-large">
-                                <i class="tainacan-icon tainacan-icon-36px tainacan-icon-filters"/>
-                            </span>
-                        </p>
-                        <p>{{ $i18n.get('info_there_is_no_filter' ) }}</p>  
-                        <p>{{ $i18n.get('info_create_filters' ) }}</p>
-                    </div>
-                </section>    
+                            animation: '250'}"> 
                     <div  
                             class="active-filter-item" 
                             :class="{
@@ -58,7 +57,7 @@
                                 'inherited-filter': filter.collection_id != collectionId || isRepositoryLevel
                             }" 
                             v-for="(filter, index) in activeFilterList" 
-                            :key="index">
+                            :key="filter.id">
                         <div class="handle">
                             <span 
                                     v-if="!(isSelectingFilterType || filter.id == undefined || openedFilterId != '' || choosenMetadatum.name == filter.name || isUpdatingFiltersOrder == true || isRepositoryLevel)"
diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue
index 6515b9499..387dff82f 100644
--- a/src/admin/components/lists/metadata-list.vue
+++ b/src/admin/components/lists/metadata-list.vue
@@ -21,10 +21,23 @@
         <b-tabs v-model="activeTab">    
             <b-tab-item :label="$i18n.get('metadata')">
                 <div
-                        :style="{ height: 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
+                        :style="{ height: activeMetadatumList.length <= 0 && !isLoadingMetadata ? 'auto' : 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
                         class="columns"
                         ref="metadataEditionPageColumns">
                     <div class="column">     
+                        <section 
+                                v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
+                                class="field is-grouped-centered section">
+                            <div class="content has-text-gray has-text-centered">
+                                <p>
+                                    <span class="icon is-large">
+                                        <i class="tainacan-icon tainacan-icon-36px tainacan-icon-metadata"/>
+                                    </span>
+                                </p>
+                                <p>{{ $i18n.get('info_there_is_no_metadatum' ) }}</p>
+                                <p>{{ $i18n.get('info_create_metadata' ) }}</p>
+                            </div>
+                        </section>     
                         <draggable 
                                 v-model="activeMetadatumList"
                                 class="active-metadata-area"
@@ -39,19 +52,6 @@
                                         chosenClass: 'sortable-chosen',
                                         filter: 'not-sortable-item', 
                                         animation: '250'}">
-                            <section 
-                                    v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
-                                    class="field is-grouped-centered section">
-                                <div class="content has-text-gray has-text-centered">
-                                    <p>
-                                        <span class="icon is-large">
-                                            <i class="tainacan-icon tainacan-icon-36px tainacan-icon-metadata"/>
-                                        </span>
-                                    </p>
-                                    <p>{{ $i18n.get('info_there_is_no_metadatum' ) }}</p>
-                                    <p>{{ $i18n.get('info_create_metadata' ) }}</p>
-                                </div>
-                            </section>         
                             <div  
                                     class="active-metadatum-item"
                                     :class="{
@@ -61,7 +61,7 @@
                                         'inherited-metadatum': (metadatum.collection_id != collectionId && metadatum.parent == 0) || isRepositoryLevel
                                     }" 
                                     v-for="(metadatum, index) in activeMetadatumList"
-                                    :key="index">
+                                    :key="metadatum.id">
                                 <div class="handle">
                                     <span 
                                             v-if="!(isRepositoryLevel || metadatum.id == undefined || openedMetadatumId != '' || isUpdatingMetadataOrder)"