diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
index 337839d40b97255bc0b555b8360206a1b2bb8c47..7ee682369c2e07042a01fca99f99d88ff1fbb7af 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
@@ -15,7 +15,7 @@
         <div *ngIf="this['indexingModels_'+category].length > 0 || adminMode" class="banner"
             [style.borderColor]="currentPriorityColor">
             <div class="title" [style.color]="currentPriorityColor">
-                {{lang[category] | uppercase}} <small *ngIf="category === 'mail'" style="font-size: 50%;padding-right: 10px;" [title]="lang.category_id">{{lang['indexing_' + currentCategory]}}</small>
+                {{lang[category] | uppercase}} <small *ngIf="category === 'mail'" [title]="lang.category_id">{{lang['indexing_' + currentCategory] | titlecase}}</small>
                 <div class="title-divider"></div>
             </div>
             <div class="content">
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.scss b/src/frontend/app/indexation/indexing-form/indexing-form.component.scss
index 64fdc3c9930817d31661ca244f4c824b1be301e4..f89501e8bcfc99ab9193b9ea0733bf84a3710767 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.scss
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.scss
@@ -34,6 +34,11 @@
             background: white;
             height: 1px;
         }
+
+        small {
+            font-size: 50%;
+            padding-right: 10px;
+        }
     }
 
     .content {
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
index 251c65063142fd036cbf0dacc6fed95631718c74..3efcaad246916780db7a3994fef03e6efe162363 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -220,7 +220,10 @@ export class IndexingFormComponent implements OnInit {
                 event.container.data,
                 event.previousIndex,
                 event.currentIndex);
-            this.initElemForm();
+            if (['destination', 'priority'].indexOf(event.item.data.identifier) > -1) {
+                this.initElemForm();
+            }
+
         }
     }
 
@@ -415,7 +418,7 @@ export class IndexingFormComponent implements OnInit {
                             if (elem.default_value !== '') {
                                 this.calcLimitDate(elem, elem.default_value);
                             }
-                            
+
                         }
                     });
                 });
@@ -485,7 +488,7 @@ export class IndexingFormComponent implements OnInit {
         if (!this.adminMode) {
             this.arrFormControl['mail­tracking'] = new FormControl({ value: '', disabled: this.adminMode ? true : false });
         }
-        
+
 
         this.fieldCategories.forEach(category => {
             this['indexingModels_' + category] = [];
@@ -653,7 +656,9 @@ export class IndexingFormComponent implements OnInit {
     }
 
     launchEvent(value: any, field: any) {
-        this[field.event](field, value);
+        if (field.event !== undefined) {
+            this[field.event](field, value);
+        }
     }
 
     calcLimitDate(field: any, value: any) {