diff --git a/package-lock.json b/package-lock.json
index ed1b346c56a204b22239eb39ed2cff7289a3ea02..6e67085b97bfb75cec51d97d7f3371ca1fe9e6cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1731,7 +1731,7 @@
         "@angular/compiler": "^8.1.3",
         "boxen": "^4.1.0",
         "colorette": "^1.1.0",
-        "flat": "git://github.com/lenchvolodymyr/flat.git#ffe77efe8c33bc80ffb2f7a465537610dea4f611",
+        "flat": "git://github.com/lenchvolodymyr/flat.git#ffe77ef",
         "gettext-parser": "^4.0.1",
         "glob": "^7.1.4",
         "mkdirp": "^0.5.1",
@@ -2406,7 +2406,7 @@
     },
     "ansi-escapes": {
       "version": "3.2.0",
-      "resolved": "https://packages.dlcm.ch/repository/npm-group/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
       "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "dev": true
     },
@@ -5638,7 +5638,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5659,12 +5660,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5679,17 +5682,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5806,7 +5812,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5818,6 +5825,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5832,6 +5840,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5839,12 +5848,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5863,6 +5874,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5943,7 +5955,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5955,6 +5968,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6040,7 +6054,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6076,6 +6091,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6095,6 +6111,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6138,12 +6155,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -9624,7 +9643,7 @@
     },
     "path": {
       "version": "0.12.7",
-      "resolved": "https://packages.dlcm.ch/repository/npm-group/path/-/path-0.12.7.tgz",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
       "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
       "dev": true,
       "requires": {
@@ -9634,7 +9653,7 @@
       "dependencies": {
         "util": {
           "version": "0.10.4",
-          "resolved": "https://packages.dlcm.ch/repository/npm-group/util/-/util-0.10.4.tgz",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
           "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
           "dev": true,
           "requires": {
diff --git a/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail.presentational.scss b/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail.presentational.scss
index 13986a63ed027744a01465ce14d9dcc563c63829..f5de11ed83401232ab7da9a5c0cbd0f0b9cc63b8 100644
--- a/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail.presentational.scss
+++ b/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail.presentational.scss
@@ -54,7 +54,7 @@ $padding-bottom-desktop: 20px;
 
   .code {
     font-family: monospace;
-    white-space: pre-line;
+    white-space: pre-wrap;
     padding-top: 0;
   }
 }
diff --git a/src/app/shared/stores/person/shared-person.state.ts b/src/app/shared/stores/person/shared-person.state.ts
index ec260d0ba6cb23b59bba18066e143a6abcd05158..bf05f2bea7c7478a641a209e9f67915d84d8eddc 100644
--- a/src/app/shared/stores/person/shared-person.state.ts
+++ b/src/app/shared/stores/person/shared-person.state.ts
@@ -177,26 +177,30 @@ export class SharedPersonState extends ResourceState<PersonExtended> {
   searchInstitutions(ctx: StateContext<SharedPersonStateModel>, action: SharedPersonAction.SearchInstitutions): void {
     const listActionSubActionCompletionsWrapper: ActionSubActionCompletionsWrapper[] = [];
 
-    ctx.getState().listPersonMatching.forEach(p => {
-      listActionSubActionCompletionsWrapper.push({
-        action: new SharedPersonAction.SearchPersonInstitution(p),
-        subActionCompletions: [
-          this.actions$.pipe(ofActionCompleted(SharedPersonAction.SearchPersonInstitutionSuccess)),
-          this.actions$.pipe(ofActionCompleted(SharedPersonAction.SearchPersonInstitutionFail)),
-        ]
-      } as ActionSubActionCompletionsWrapper);
-    });
+    if (ctx.getState().listPersonMatching !== []) {
+      ctx.getState().listPersonMatching.forEach(p => {
+        listActionSubActionCompletionsWrapper.push({
+          action: new SharedPersonAction.SearchPersonInstitution(p),
+          subActionCompletions: [
+            this.actions$.pipe(ofActionCompleted(SharedPersonAction.SearchPersonInstitutionSuccess)),
+            this.actions$.pipe(ofActionCompleted(SharedPersonAction.SearchPersonInstitutionFail)),
+          ]
+        } as ActionSubActionCompletionsWrapper);
+      });
+
+      StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, listActionSubActionCompletionsWrapper)
+        .pipe(
+          tap(success => {
+            if (success) {
+              ctx.dispatch(new SharedPersonAction.SearchInstitutionsSuccess(action));
+            } else {
+              ctx.dispatch(new SharedPersonAction.SearchInstitutionsFail(action));
+            }
+          })
+        ).subscribe();
+    }
+    ctx.dispatch(new SharedPersonAction.SearchInstitutionsSuccess(action));
 
-    StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, listActionSubActionCompletionsWrapper)
-      .pipe(
-        tap(success => {
-          if (success) {
-            ctx.dispatch(new SharedPersonAction.SearchInstitutionsSuccess(action));
-          } else {
-            ctx.dispatch(new SharedPersonAction.SearchInstitutionsFail(action));
-          }
-        })
-      ).subscribe();
   }
 
   @Action(SharedPersonAction.SearchPersonInstitution)